refactored bundling
Added condition to user creation