Fixed account setting
Merge branch 'user' into user-adivspan
Merge pull request #503 from adivspan/user-adivspan

Fixed account setting