Use the plain password here, fix the edit case
Merge branch 'master' of git://github.com/Gnuckorg/DaOAuthServerBundle