diff --git a/lib/services/http_requests.dart b/lib/services/http_requests.dart
index 686c989..7484447 100644
--- a/lib/services/http_requests.dart
+++ b/lib/services/http_requests.dart
@@ -29,10 +29,11 @@ Future<Map<String, dynamic>> apiRequest({
   required String type,
   bool? overrideTimeout,
 }) async {
+  final String connectionString = "${server.connectionMethod}://${server.domain}${server.port != null ? ':${server.port}' : ""}${server.path ?? ""}/control$urlPath";
   try {
     HttpClient httpClient = HttpClient();
     if (method == 'get') {
-      HttpClientRequest request = await httpClient.getUrl(Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control$urlPath"));
+      HttpClientRequest request = await httpClient.getUrl(Uri.parse(connectionString));
       request.headers.set('Authorization', 'Basic ${server.authToken}');
       HttpClientResponse response = overrideTimeout == true 
         ? await request.close()
@@ -57,7 +58,7 @@ Future<Map<String, dynamic>> apiRequest({
       }    
     }
     else if (method == 'post') {
-      HttpClientRequest request = await httpClient.postUrl(Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control$urlPath"));
+      HttpClientRequest request = await httpClient.postUrl(Uri.parse(connectionString));
       request.headers.set('Authorization', 'Basic ${server.authToken}');
       request.headers.set('content-type', 'application/json');
       request.add(utf8.encode(json.encode(body)));
diff --git a/lib/widgets/add_server_modal.dart b/lib/widgets/add_server_modal.dart
index 3c19202..c415481 100644
--- a/lib/widgets/add_server_modal.dart
+++ b/lib/widgets/add_server_modal.dart
@@ -12,7 +12,6 @@ import 'package:adguard_home_manager/services/http_requests.dart';
 import 'package:adguard_home_manager/models/app_log.dart';
 import 'package:adguard_home_manager/providers/servers_provider.dart';
 import 'package:adguard_home_manager/models/server.dart';
-import 'package:adguard_home_manager/config/system_overlay_style.dart';
 
 class AddServerModal extends StatefulWidget {
   final Server? server;
@@ -528,7 +527,7 @@ class _AddServerModalState extends State<AddServerModal> {
                   )
                 ),
                 child: Text(
-                  "$connectionType://${ipDomainController.text}${pathController.text}${portController.text != '' ? ':${portController.text}' : ""}",
+                  "$connectionType://${ipDomainController.text}${portController.text != '' ? ':${portController.text}' : ""}${pathController.text}",
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     color: Theme.of(context).primaryColor,