added lockable login
lockable login bug fix
fixed lockable login bugs #2
Merge branches 'master' and 'ildph'