Removed white-lines and solved user-creation conflicts.