User create fixes