diff --git a/src/Ombi/ClientApp/app/app.component.html b/src/Ombi/ClientApp/app/app.component.html
index 100e3e30a..c2c88fa30 100644
--- a/src/Ombi/ClientApp/app/app.component.html
+++ b/src/Ombi/ClientApp/app/app.component.html
@@ -28,7 +28,7 @@
                 <li id="UserManagement" [routerLinkActive]="['active']"><a  [routerLink]="['/usermanagement']"><i class="fa fa-user"></i> User Management</a></li>
             </ul>
             <ul *ngIf="hasRole('Admin') || hasRole('PowerUser')" class="nav navbar-nav">
-                <li><a href="https://www.paypal.me/PlexRequestsNet" target="_blank" pTooltip="This is how I convince my wife to let me spend my spare time on Ombi ;)"><i class="fa fa-heart" style="color:red"></i> Donate!</a></li>
+                <li><a href="https://www.paypal.me/PlexRequestsNet" target="_blank" pTooltip="This is how I convince my wife to let me spend my spare time developing Ombi ;)"><i class="fa fa-heart" style="color:red"></i> Donate!</a></li>
             </ul>
 
             
diff --git a/src/Ombi/Controllers/TokenController.cs b/src/Ombi/Controllers/TokenController.cs
index 1a20af0c9..3e5ff9f07 100644
--- a/src/Ombi/Controllers/TokenController.cs
+++ b/src/Ombi/Controllers/TokenController.cs
@@ -53,7 +53,13 @@ namespace Ombi.Controllers
 
             if (user == null)
             {
-                return new UnauthorizedResult();
+                // Could this be an email login?
+                user = await _userManager.FindByEmailAsync(model.Username);
+
+                if (user == null)
+                {
+                    return new UnauthorizedResult();
+                }
             }
 
             // Verify Password