Updated to use the current user when attempting to login