diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index b8bb090552..3a47e97de6 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Services.AuthenticationService
                         m_log.DebugFormat("[Authenticate]: Web Login failed for PrincipalID {0}", principalID);
                     }
                 }
-                if (data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
+                if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
                 {
                     svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "PasswordAuthenticationService", args);
                     result = svc.Authenticate(principalID, password, lifetime);