Merge my version of yii-user with tho one on GitHub