fix error with locking screen after multiples attempts to login
Merge branch 'origin/develop'