diff --git a/actions/pagekite b/actions/pagekite
index afd612bbd..424b460d7 100755
--- a/actions/pagekite
+++ b/actions/pagekite
@@ -53,7 +53,7 @@ def parse_arguments():
     subparsers.add_parser('stop-and-disable', help='Disable PageKite service')
     subparsers.add_parser('restart', help='Restart PageKite service')
     subparsers.add_parser('is-disabled',
-                          help=('Wether PageKite is disabled in the file '
+                          help=('Whether PageKite is disabled in the file '
                                 '/etc/pagekite.d/10_accounts.rc'))
 
     # Frontend
diff --git a/plinth/modules/pagekite/utils.py b/plinth/modules/pagekite/utils.py
index 4d8a17af6..d19095638 100644
--- a/plinth/modules/pagekite/utils.py
+++ b/plinth/modules/pagekite/utils.py
@@ -94,7 +94,7 @@ def get_pagekite_config():
     # To enable PageKite two things are necessary:
     # 1) pagekite not being disabled in /etc/pagekite.d/10_account.rc
     # 2) the pagekite service running
-    is_disabled = run(['is-disabled']).strip()=='true'
+    is_disabled = (run(['is-disabled']).strip() == 'true')
     service_running = action_utils.service_is_running('pagekite')
     status['enabled'] = service_running and not is_disabled
 
@@ -102,16 +102,20 @@ def get_pagekite_config():
     status.update(get_kite_details())
 
     # PageKite frontend server
-    server = run(['get-frontend'])
-    # Frontend-Entries are only considered valid if there's a ':' in them
-    # otherwise, pagekite refuses to work, and we only set values with ':'.
+    server = run(['get-frontend']).strip()
+
+    # Frontend entries are only considered valid if there's a ':' in
+    # them otherwise, pagekite refuses to work, and we only set values
+    # with ':'.
     if ':' in server:
-        server_domain, server_port = server.strip().split(':')
+        server_domain, server_port = server.split(':')
         status['server_domain'] = server_domain
-        status['server_port'] = server_port
+        status['server_port'] = int(server_port)
     else:
-        # no valid entry exists, default to port 80
-        status['server_port'] = 80
+        status['server_domain'] = server
+        # No valid entry exists, default to port 80.  Hack: Return
+        # string instead of int to force setting port on save
+        status['server_port'] = '80'
 
     return status