Fix unlock user
HR-291
Allow Registered Shopping/Enrolling Users to switch plans
Manual Merge