Added custom error codes for user operations
Merge branch 'develop'