Re-arranged the login so I don't have to specify the return value
of true or false