[FIX] Account Lockouts on Edit Account page

Fixes #939 once merged.