[FIX] Account Lockouts on Edit Account page

Fixes #939 once merged.
Merge pull request #940 from TheSerapher/issue-939

[FIX] Account Lockouts on Edit Account page