diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 5e72c67..999e639 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.2.508")]
-[assembly: AssemblyFileVersion("3.0.2.508")]
+[assembly: AssemblyVersion("3.0.2.509")]
+[assembly: AssemblyFileVersion("3.0.2.509")]
diff --git a/WebApplication/Code/LoginTools.cs b/WebApplication/Code/LoginTools.cs
index 52da22d..d15713a 100644
--- a/WebApplication/Code/LoginTools.cs
+++ b/WebApplication/Code/LoginTools.cs
@@ -47,7 +47,7 @@ namespace ScrewTurn.Wiki {
 					SetupSession(null);
 				}
 			}
-			else if(HttpContext.Current.Session[Logout] == null) { // Check for filtered autologin
+			else if(SessionFacade.LoginKey == null && HttpContext.Current.Session[Logout] == null) { // Check for filtered autologin
 				// If no cookie is available, try to autologin through providers
 				UserInfo user = Users.TryAutoLogin(HttpContext.Current);
 				if(user != null) {