Fixes several bugs with user administration