diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart
index e6c0e5c9..8295df27 100644
--- a/lib/ui/pages/services/services.dart
+++ b/lib/ui/pages/services/services.dart
@@ -133,8 +133,13 @@ class _Card extends StatelessWidget {
                         Column(
                           children: [
                             GestureDetector(
+<<<<<<< HEAD
                               onTap: () => launchURL(
                                 'https://${service.url}',
+=======
+                              onTap: () => _launchURL(
+                                service.url,
+>>>>>>> master
                               ),
                               child: Text(
                                 '${service.url}',
diff --git a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart
index 969e3d39..6ac0e127 100644
--- a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart
+++ b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart
@@ -55,8 +55,7 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
                     if (servers != null && servers.isNotEmpty)
                       Column(
                         children: [
-                          if (servers.length == 1 ||
-                              (!_isExtended && _isServerFound(servers)))
+                          if (!_isExtended && _isServerFound(servers))
                             confirmServer(
                               context,
                               _firstValidServer(servers),