Modified server roles checking

Depends on 392