fixes bug 1055603 - Better user management