Refactoring login controller
merge result