Corrected dispatcher flow and login controller