diff --git a/rc_hip/repapp/migrations/0014_alter_cafe_reparateur_alter_device_guest_and_more.py b/rc_hip/repapp/migrations/0014_alter_cafe_reparateur_alter_device_guest_and_more.py
new file mode 100644
index 0000000..cdc6c4d
--- /dev/null
+++ b/rc_hip/repapp/migrations/0014_alter_cafe_reparateur_alter_device_guest_and_more.py
@@ -0,0 +1,29 @@
+# Generated by Django 4.2 on 2023-06-18 15:51
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('repapp', '0013_device_reparateur'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cafe',
+            name='reparateur',
+            field=models.ManyToManyField(null=True, to='repapp.reparateur'),
+        ),
+        migrations.AlterField(
+            model_name='device',
+            name='guest',
+            field=models.ForeignKey(choices=[(-1, 'abgelehnt'), (0, 'neu'), (1, 'in Orga Rückfrage'), (2, 'in Orga Rückfrage beantwortet'), (3, 'in der Warteliste'), (4, 'in Repa Rückfrage'), (5, 'in Repa Rückfrage beantwortet')], null=True, on_delete=django.db.models.deletion.CASCADE, to='repapp.guest', verbose_name='Gast'),
+        ),
+        migrations.AlterField(
+            model_name='device',
+            name='reparateur',
+            field=models.ManyToManyField(null=True, to='repapp.reparateur'),
+        ),
+    ]
diff --git a/rc_hip/repapp/views.py b/rc_hip/repapp/views.py
index 93f5150..8cc1773 100644
--- a/rc_hip/repapp/views.py
+++ b/rc_hip/repapp/views.py
@@ -635,21 +635,24 @@ class QuestionDeviceFormView(LoginRequiredMixin, UserPassesTestMixin, generic.ed
                 organisator=organisator,
                 device=device
             )
+            question.save()
 
             send_device_question_mail(question, self.request)
+
             device.status = Device.STATUS_ORGA_QUESTION
+            device.save()
         elif reparateur:
             question = Question(
                 question=message,
                 reparateur=reparateur,
                 device=device
             )
+            question.save()
 
             device.status = Device.STATUS_REPA_QUESTION
+            device.save()
         else:
             raise PermissionDenied('Not valid member found!')
-        question.save()
-        device.save()
 
         return HttpResponseRedirect(
             reverse_lazy('member')