Changes to the login servlet
Merge