diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index c6daa17345..d39c7c449a 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -162,12 +162,9 @@ class PathsadminpanelAction extends AdminPanelAction
 
         // Validate SSL setup
 
-        if (in_array($values['site']['ssl'], array('sometimes', 'always'))) {
-            if (empty($values['site']['sslserver'])) {
-                $this->clientError(_("You must set an SSL server when enabling SSL."));
-            }
+        if (mb_strlen($values['site']['sslserver']) > 255) {
+            $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
         }
-
     }
 
 }
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index f260a44760..5e29f4c191 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -191,10 +191,6 @@ class SiteadminpanelAction extends AdminPanelAction
             $this->clientError(_("Snapshot frequency must be a number."));
         }
 
-        if (mb_strlen($values['site']['sslserver']) > 255) {
-            $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
-        }
-
         // Validate text limit
 
         if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {