diff --git a/src/Ombi.Helpers/GlobalMutex.cs b/src/Ombi.Helpers/GlobalMutex.cs
new file mode 100644
index 000000000..ecf9cdf15
--- /dev/null
+++ b/src/Ombi.Helpers/GlobalMutex.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Threading;
+
+namespace Ombi.Helpers
+{
+    public static class GlobalMutex
+    {
+        public static T Lock<T>(Func<T> func)
+        {
+            const string mutexId = "Global\\OMBI";
+
+            using (var mutex = new Mutex(false, mutexId, out __))
+            {
+                var hasHandle = false;
+                try
+                {
+                    try
+                    {
+                        hasHandle = mutex.WaitOne(5000, false);
+                        if (hasHandle == false)
+                            throw new TimeoutException("Timeout waiting for exclusive access");
+                    }
+                    catch (AbandonedMutexException)
+                    {
+                        hasHandle = true;
+                    }
+
+                    return func();
+                }
+                finally
+                {
+                    if (hasHandle)
+                        mutex.ReleaseMutex();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Ombi/Controllers/TokenController.cs b/src/Ombi/Controllers/TokenController.cs
index 44ec5686f..b27c04caa 100644
--- a/src/Ombi/Controllers/TokenController.cs
+++ b/src/Ombi/Controllers/TokenController.cs
@@ -123,9 +123,6 @@ namespace Ombi.Controllers
                 return new UnauthorizedResult();
             }
 
-            user.LastLoggedIn = DateTime.UtcNow;
-            await _userManager.UpdateAsync(user);
-
             var claims = new List<Claim>
             {
                 new Claim(JwtRegisteredClaimNames.Sub, user.UserName),
@@ -152,6 +149,9 @@ namespace Ombi.Controllers
                 //await _token.CreateToken(new Tokens() {Token = accessToken, User = user});
             }
 
+            user.LastLoggedIn = DateTime.UtcNow;
+            await _userManager.UpdateAsync(user);
+
             return new JsonResult(new
             {
                 access_token = accessToken,