Fix bug #114 (ESC causes failed login) and related timeout issue#193

rdslw wants to merge 2 commits intogoogle:mastergoogle/xsecurelock:masterfrom

rdslw:masterrdslw/xsecurelock:masterCopy head branch name to clipboard