added some very rudamentary domain and user checks