diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala
index 478c7c5..93036eb 100644
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -55,6 +55,10 @@
   post("/admin/system", form)(adminOnly { form =>
     saveSystemSettings(form)
 
+    if(form.ssh && SshServer.isActive && context.settings.sshPort != form.sshPort){
+      SshServer.stop()
+    }
+
     if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){
       SshServer.start(request.getServletContext,
         form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
diff --git a/src/main/scala/ssh/SshServerListener.scala b/src/main/scala/ssh/SshServerListener.scala
index f8e08fd..b9bfb7c 100644
--- a/src/main/scala/ssh/SshServerListener.scala
+++ b/src/main/scala/ssh/SshServerListener.scala
@@ -31,6 +31,7 @@
   def stop() = {
     if(active.compareAndSet(true, false)){
       server.stop(true)
+      logger.info("SSH Server is stopped.")
     }
   }