diff --git a/Site/Master-v5.master b/Site/Master-v5.master
index fe3c72ee..ff6cabc3 100644
--- a/Site/Master-v5.master
+++ b/Site/Master-v5.master
@@ -14,7 +14,6 @@
-
@@ -33,7 +32,6 @@
-
@@ -115,19 +113,6 @@
diff --git a/Site/Security/Login.aspx.cs b/Site/Security/Login.aspx.cs
index 14070427..ccbd9c45 100644
--- a/Site/Security/Login.aspx.cs
+++ b/Site/Security/Login.aspx.cs
@@ -237,7 +237,7 @@ namespace Swarmops.Pages.Security
// TODO: Determine last logged-on organization. Right now, log on to Sandbox.
GuidCache.Set (credentials.uri + "-LoggedOn",
- person.Identity.ToString (CultureInfo.InvariantCulture) + ",1,,BitId 2FA");
+ Authority.FromLogin(person, Organization.FromIdentity(person.LastLogonOrganizationId)).ToEncryptedXml());
}
}
catch (Exception e)