Fixing add user some more :P