User add fixes