Fix login redirection

Fix login redirection so that it usually goes to the "home screen", or
initial activity screen, as it should always have done, and only
redirects to another activity when a previous attempt to go to that
other activity is what caused the request to log in anyway.