Merge "If a user logs in while not on https, then the user should be sent back to...