Revert "Revert "Merge pull request #218 from aipocom/bugfix/user-add-rollback""

This reverts commit 71b9c8a612872dbd54f07c011c7b15b1e7910b5a.