diff --git a/packages/network/openssh/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd
index 9eb2cf2fb3..d8effb1e9c 100644
--- a/packages/network/openssh/init.d/51_sshd
+++ b/packages/network/openssh/init.d/51_sshd
@@ -22,6 +22,10 @@
 #
 # runlevels: openelec, textmode
 
+  if [ -f /var/config/settings.conf ]; then
+    . /var/config/settings.conf
+  fi
+
   RSA1_KEY="/storage/.cache/ssh/ssh_host_key"
   RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key"
   DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key"
@@ -36,7 +40,7 @@
       . /etc/ssh.conf
     fi
 
-    if [ "$SSH" = yes -o -f /storage/.config/ssh_enable ]; then
+    if [ "$SSH" = yes -o -f /storage/.config/ssh_enable -o "$SSHD_START" == "true" ]; then
 
     # Check for the SSH1 RSA key
       if [ ! -s $RSA1_KEY ] ; then