Fixes a slipped in conflict in LoginController.

Change-Id: I95dc18e52ceb0b52b797885a59f4ec10570d088d