Reactivate the autodomain feature

Don't know why these where deactivates in tnariks branch but I will test this.