One more change for login rename issue.