Query user, not juste username
Merge branch '1-3' into dev