Merge "Login-related messages should get the URL as a parameter"