Fixes project id generation for non admin users
Merge branch 'master' into staging