fixing login for UI:
erge branch 'feature/ui-skins' into develop