Revert "Removed defaulting of role"

This reverts commit 6d9a8f820063e589428f6ae53edc30c2c81b6788.