Fixed issue if there is an error in addLoginService(), the error is not returned if there is a callback.
Simplified if-s. Spaces to tabs.