Allow overriding principal (temp solution ?)