diff --git a/src/command/command.c b/src/command/command.c
index b8daa7eb..b6fd572c 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1195,6 +1195,7 @@ cmd_init(void)
     account_clear_ac = autocomplete_new();
     autocomplete_add(account_clear_ac, "password");
     autocomplete_add(account_clear_ac, "server");
+    autocomplete_add(account_clear_ac, "port");
     autocomplete_add(account_clear_ac, "otr");
 
     close_ac = autocomplete_new();
diff --git a/src/command/commands.c b/src/command/commands.c
index eb361b3e..fa0a423e 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -366,6 +366,10 @@ cmd_account(gchar **args, struct cmd_help_t help)
                     accounts_clear_server(account_name);
                     cons_show("Removed server for account %s", account_name);
                     cons_show("");
+                } else if (strcmp(property, "port") == 0) {
+                    accounts_clear_port(account_name);
+                    cons_show("Removed port for account %s", account_name);
+                    cons_show("");
                 } else if (strcmp(property, "otr") == 0) {
                     accounts_clear_otr(account_name);
                     cons_show("OTR policy removed for account %s", account_name);
diff --git a/src/config/accounts.c b/src/config/accounts.c
index fffb45e1..00cfba18 100644
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -449,6 +449,15 @@ _accounts_clear_server(const char * const account_name)
     }
 }
 
+static void
+_accounts_clear_port(const char * const account_name)
+{
+    if (accounts_account_exists(account_name)) {
+        g_key_file_remove_key(accounts, account_name, "port", NULL);
+        _save_accounts();
+    }
+}
+
 static void
 _accounts_clear_otr(const char * const account_name)
 {
@@ -872,6 +881,7 @@ accounts_init_module(void)
     accounts_get_priority_for_presence_type = _accounts_get_priority_for_presence_type;
     accounts_clear_password = _accounts_clear_password;
     accounts_clear_server = _accounts_clear_server;
+    accounts_clear_port = _accounts_clear_port;
     accounts_clear_otr = _accounts_clear_otr;
     accounts_add_otr_policy = _accounts_add_otr_policy;
 }
diff --git a/src/config/accounts.h b/src/config/accounts.h
index a16c0cfb..97c125eb 100644
--- a/src/config/accounts.h
+++ b/src/config/accounts.h
@@ -79,6 +79,7 @@ gint (*accounts_get_priority_for_presence_type)(const char * const account_name,
     resource_presence_t presence_type);
 void (*accounts_clear_password)(const char * const account_name);
 void (*accounts_clear_server)(const char * const account_name);
+void (*accounts_clear_port)(const char * const account_name);
 void (*accounts_clear_otr)(const char * const account_name);
 void (*accounts_add_otr_policy)(const char * const account_name, const char * const contact_jid, const char * const policy);