Fixing integration issues.
Fixing typo
Fixing shim error on new user regisitration
Merge pull request #143 from mapkyca/integration_issues

Integration issues