ed5876f
Trac Ticket 396 - Account Usability Control Not Working (cherry picked from commit 08c7cc004069eef8a766e28a45e36a3d99097f3e)