Minor code change on model service.
Refactored login authentication data handling.