Fix for user app flow interruption and code regeneration
Merge pull request #26 from techiev2/users

Fix for user app flow interruption and code regeneration