fix bug that prevented locking a scoped and a non scoped account at the same time
simplify code
Merge pull request #55 from eadz/can_lock_non_scoped_account

fix bug preventing locking a scoped and a non scoped account