diff --git a/src/Jackett/Controllers/ServerConfigurationController.cs b/src/Jackett/Controllers/ServerConfigurationController.cs
index b03e9861a..1f9ef1c38 100644
--- a/src/Jackett/Controllers/ServerConfigurationController.cs
+++ b/src/Jackett/Controllers/ServerConfigurationController.cs
@@ -47,7 +47,7 @@ namespace Jackett.Controllers.V20
         {
             var oldPassword = serverConfig.AdminPassword;
             if (string.IsNullOrEmpty(password))
-                password = string.Empty;
+                password = null;
 
             if (oldPassword != password)
             {
diff --git a/src/Jackett/Services/SecuityService.cs b/src/Jackett/Services/SecuityService.cs
index fefe88ab1..5d52ae456 100644
--- a/src/Jackett/Services/SecuityService.cs
+++ b/src/Jackett/Services/SecuityService.cs
@@ -24,6 +24,8 @@ namespace Jackett.Services
 
         public string HashPassword(string input)
         {
+            if (input == null)
+                return null;
             // Append key as salt
             input += _serverConfig.APIKey;