Attempt to get log-in to work better