diff --git a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
index b0dbf14d8d..e03448fd29 100644
--- a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
+++ b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
@@ -78,6 +78,7 @@ public class ScmConfiguration
     this.pluginUrl = other.pluginUrl;
     this.sslPort = other.sslPort;
     this.enableSSL = other.enableSSL;
+    this.port = other.port;
     this.anonymousAccessEnabled = other.anonymousAccessEnabled;
   }
 
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.config.js b/scm-webapp/src/main/webapp/resources/js/sonia.config.js
index 3d16b9bcf4..3490731de1 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.config.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.config.js
@@ -99,7 +99,7 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
           name: 'servername',
           allowBlank: false
         },{
-          xtype: 'textfield',
+          xtype: 'numberfield',
           fieldLabel: 'Serverport',
           name: 'port',
           allowBlank: false
@@ -120,10 +120,10 @@ Sonia.config.ScmConfigPanel = Ext.extend(Sonia.config.ConfigPanel,{
           name: 'enableSSL',
           inputValue: 'true'
         },{
-          xtype: 'textfield',
+          xtype: 'numberfield',
           fieldLabel: 'SSL Port',
           name: 'sslPort',
-          vtype: 'alphanum'
+          allowBlank: false
         }],
       
         onSubmit: function(values){