Fixed first signup : always admin
Merge branch 'dev'