merge fixing
merge 2 fixing
Merge pull request #2 from artem-lubenskiy/1235-bug-login2

1235 bug login2