Extracting logic to a method in UserManipulator
Merge pull request #1247 from Cydonia8/master

Extracting logic to a method in UserManipulator