bugfix for login order