derp again, fixed variable names
Merge branch 'login-bugfixes' into dev