Got rid of TODO about previous commit.
Fixed yet another error caused by the slight model revamp of manage users.