diff --git a/usr/lib/initcpio/hooks/arch_remote b/usr/lib/initcpio/hooks/arch_remote
index e6f4975f7..55a88b303 100644
--- a/usr/lib/initcpio/hooks/arch_remote
+++ b/usr/lib/initcpio/hooks/arch_remote
@@ -7,4 +7,6 @@ run_hook ()
     touch /var/lib/nfs/state
     touch /var/lib/nfs/rmtab
     touch /var/lib/nfs/etab
+    # allow empty password login on sshd
+    echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config
 }
diff --git a/usr/lib/initcpio/install/arch_remote b/usr/lib/initcpio/install/arch_remote
index ebbf0f317..508eda8a5 100644
--- a/usr/lib/initcpio/install/arch_remote
+++ b/usr/lib/initcpio/install/arch_remote
@@ -37,6 +37,8 @@ build ()
     add_dir "/var/lib/nfs/sm.bak"
     add_dir "/var/lib/nfs/v4recovery"
     add_dir "/var/lib/nfs/rpc_pipefs"
+    # start sshd on startup
+    add_symlink "/etc/systemd/system/multi-user.target.wants/sshd.service" "/usr/lib/systemd/system/sshd.service"
     # fix licenses
     add_file "/usr/share/licenses/rpcbind/COPYING"
     add_file "/usr/share/licenses/libsasl/COPYING"