fix bug on login
deprecate a load of stuff