Fixed problems to include the login