diff --git a/app/forms/service.py b/app/forms/service.py
index 76ef794..bc19add 100644
--- a/app/forms/service.py
+++ b/app/forms/service.py
@@ -34,6 +34,9 @@ class CreateServiceForm(FlaskForm):
         else:
             self.costs.default = 0
 
+        if self.description.data:
+            self.description.default = self.description.data
+
 
 class DeleteServiceForm(FlaskForm):
     submit = SubmitField(label='Really delete this service!')
@@ -67,4 +70,6 @@ class EditServiceForm(FlaskForm):
         else:
             self.costs.default = 0
 
+        if self.description.data:
+            self.description.default = self.description.data