diff --git a/NzbDrone.Host/AccessControl/FirewallAdapter.cs b/NzbDrone.Host/AccessControl/FirewallAdapter.cs
index 72d194446..3aa624d10 100644
--- a/NzbDrone.Host/AccessControl/FirewallAdapter.cs
+++ b/NzbDrone.Host/AccessControl/FirewallAdapter.cs
@@ -26,18 +26,21 @@ namespace NzbDrone.Host.AccessControl
         {
             if (IsFirewallEnabled())
             {
-                if (IsNzbDronePortOpen())
+                if (!IsNzbDronePortOpen(_configFileProvider.Port))
                 {
-                    _logger.Trace("NzbDrone port is already open, skipping.");
-                    return;
+                    _logger.Trace("Opening Port for NzbDrone: {0}", _configFileProvider.Port);
+                    OpenFirewallPort(_configFileProvider.Port);
                 }
 
-                OpenFirewallPort(_configFileProvider.Port);
+                if (_configFileProvider.EnableSsl && !IsNzbDronePortOpen(_configFileProvider.SslPort))
+                {
+                    _logger.Trace("Opening SSL Port for NzbDrone: {0}", _configFileProvider.SslPort);
+                    OpenFirewallPort(_configFileProvider.SslPort);
+                }
             }
         }
 
-
-        private bool IsNzbDronePortOpen()
+        private bool IsNzbDronePortOpen(int port)
         {
             try
             {
@@ -52,7 +55,7 @@ namespace NzbDrone.Host.AccessControl
 
                 foreach (INetFwOpenPort p in ports)
                 {
-                    if (p.Port == _configFileProvider.Port)
+                    if (p.Port == port)
                         return true;
                 }
             }
@@ -63,8 +66,6 @@ namespace NzbDrone.Host.AccessControl
             return false;
         }
 
-
-
         private void OpenFirewallPort(int portNumber)
         {
             try
diff --git a/UI/Settings/General/GeneralTemplate.html b/UI/Settings/General/GeneralTemplate.html
index 01b9c40d1..44d9e3d11 100644
--- a/UI/Settings/General/GeneralTemplate.html
+++ b/UI/Settings/General/GeneralTemplate.html
@@ -47,7 +47,7 @@
                 <label class="control-label">SSL Cert Hash</label>
 
                 <div class="controls">
-                    <input type="number" name="sslCertHash"/>
+                    <input type="text" name="sslCertHash"/>
                 </div>
             </div>
         </div>