Minor changes

Login was returning an unsafe error due to ng-bind-html. Some code
minifaction from flaapjan's side