Fixed bug where user null if not re-logged