diff --git a/mayan/apps/document_states/migrations/0016_auto_20191108_2332.py b/mayan/apps/document_states/migrations/0016_auto_20191108_2332.py
new file mode 100644
index 0000000000..6e175e00df
--- /dev/null
+++ b/mayan/apps/document_states/migrations/0016_auto_20191108_2332.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.25 on 2019-11-08 23:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('document_states', '0015_auto_20190701_1311'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='workflowstate',
+            name='completion',
+            field=models.IntegerField(blank=True, default=0, help_text='The percent of completion that this state represents in relation to the workflow. Use numbers without the percent sign.', verbose_name='Completion'),
+        ),
+        migrations.AlterField(
+            model_name='workflowstate',
+            name='initial',
+            field=models.BooleanField(default=False, help_text='The state at which the workflow will start in. Only one state can be the initial state.', verbose_name='Initial'),
+        ),
+        migrations.AlterField(
+            model_name='workflowstateaction',
+            name='when',
+            field=models.PositiveIntegerField(choices=[(1, 'On entry'), (2, 'On exit')], default=1, help_text='At which moment of the state this action will execute.', verbose_name='When'),
+        ),
+    ]
diff --git a/mayan/apps/document_states/models.py b/mayan/apps/document_states/models.py
index 9deb97d96a..0dc23adc72 100644
--- a/mayan/apps/document_states/models.py
+++ b/mayan/apps/document_states/models.py
@@ -272,13 +272,13 @@ class WorkflowState(models.Model):
     initial = models.BooleanField(
         default=False,
         help_text=_(
-            'Select if this will be the state with which you want the '
-            'workflow to start in. Only one state can be the initial state.'
+            'The state at which the workflow will start in. Only one state '
+            'can be the initial state.'
         ), verbose_name=_('Initial')
     )
     completion = models.IntegerField(
         blank=True, default=0, help_text=_(
-            'Enter the percent of completion that this state represents in '
+            'The percent of completion that this state represents in '
             'relation to the workflow. Use numbers without the percent sign.'
         ), verbose_name=_('Completion')
     )
@@ -355,7 +355,7 @@ class WorkflowStateAction(models.Model):
     when = models.PositiveIntegerField(
         choices=WORKFLOW_ACTION_WHEN_CHOICES,
         default=WORKFLOW_ACTION_ON_ENTRY, help_text=_(
-            'At which moment of the state this action will execute'
+            'At which moment of the state this action will execute.'
         ), verbose_name=_('When')
     )
     action_path = models.CharField(