fix login type issue
Merge branch 'slaivyn' into 0.1