More work on fixing/improving user administration