moved get current user to just after login