Fix issue #1269

Fix for regression introduced by c5f224ae1b (Implement managed users
feature, 2014-08-18): not allowing a (non-managed) user to be edited
from admin/users.
Merge pull request #1270 from jaysoffian/master

Fix issue #1269