diff --git a/app/Helper/Subtask.php b/app/Helper/Subtask.php
index 90bd733e9..5b8d7d90b 100644
--- a/app/Helper/Subtask.php
+++ b/app/Helper/Subtask.php
@@ -43,4 +43,47 @@ class Subtask extends \Kanboard\Core\Base
             array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'redirect' => $redirect)
         );
     }
+
+    public function selectTitle(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="1"', 'required', 'maxlength="255"'), $attributes);
+
+        $html = $this->helper->form->label(t('Title'), 'title');
+        $html .= $this->helper->form->text('title', $values, $errors, $attributes);
+
+        return $html;
+    }
+
+    public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="2"'), $attributes);
+
+        $html = $this->helper->form->label(t('Assignee'), 'user_id');
+        $html .= $this->helper->form->select('user_id', $users, $values, $errors, $attributes);
+        $html .= '&nbsp;<a href="#" class="assign-me" data-target-id="form-user_id" data-current-id="'.$this->userSession->getId().'" title="'.t('Assign to me').'">'.t('Me').'</a>';
+
+        return $html;
+    }
+
+    public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="3"'), $attributes);
+
+        $html = $this->helper->form->label(t('Original estimate'), 'time_estimated');
+        $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes);
+        $html .= ' '.t('hours');
+
+        return $html;
+    }
+
+    public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array())
+    {
+        $attributes = array_merge(array('tabindex="4"'), $attributes);
+
+        $html = $this->helper->form->label(t('Time spent'), 'time_spent');
+        $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes);
+        $html .= ' '.t('hours');
+
+        return $html;
+    }
 }
diff --git a/app/Template/subtask/create.php b/app/Template/subtask/create.php
index 82e378f54..e237619e9 100644
--- a/app/Template/subtask/create.php
+++ b/app/Template/subtask/create.php
@@ -5,22 +5,15 @@
 <form method="post" action="<?= $this->url->href('subtask', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
-
     <?= $this->form->hidden('task_id', $values) ?>
-
-    <?= $this->form->label(t('Title'), 'title') ?>
-    <?= $this->form->text('title', $values, $errors, array('required', 'autofocus', 'maxlength="255"')) ?><br/>
-
-    <?= $this->form->label(t('Assignee'), 'user_id') ?>
-    <?= $this->form->select('user_id', $users_list, $values, $errors) ?><br/>
-
-    <?= $this->form->label(t('Original estimate'), 'time_estimated') ?>
-    <?= $this->form->numeric('time_estimated', $values, $errors) ?> <?= t('hours') ?><br/>
+    <?= $this->subtask->selectTitle($values, $errors, array('autofocus')) ?>
+    <?= $this->subtask->selectAssignee($users_list, $values, $errors) ?>
+    <?= $this->subtask->selectTimeEstimated($values, $errors) ?>
 
     <?= $this->form->checkbox('another_subtask', t('Create another sub-task'), 1, isset($values['another_subtask']) && $values['another_subtask'] == 1) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
     </div>
diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php
index 2e5830690..ca0281080 100644
--- a/app/Template/subtask/edit.php
+++ b/app/Template/subtask/edit.php
@@ -5,24 +5,15 @@
 <form method="post" action="<?= $this->url->href('subtask', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
-
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->hidden('task_id', $values) ?>
-
-    <?= $this->form->label(t('Title'), 'title') ?>
-    <?= $this->form->text('title', $values, $errors, array('required', 'autofocus', 'maxlength="255"')) ?><br/>
-
-    <?= $this->form->label(t('Assignee'), 'user_id') ?>
-    <?= $this->form->select('user_id', $users_list, $values, $errors) ?><br/>
-
-    <?= $this->form->label(t('Original estimate'), 'time_estimated') ?>
-    <?= $this->form->numeric('time_estimated', $values, $errors) ?> <?= t('hours') ?><br/>
-
-    <?= $this->form->label(t('Time spent'), 'time_spent') ?>
-    <?= $this->form->numeric('time_spent', $values, $errors) ?> <?= t('hours') ?><br/>
+    <?= $this->subtask->selectTitle($values, $errors, array('autofocus')) ?>
+    <?= $this->subtask->selectAssignee($users_list, $values, $errors) ?>
+    <?= $this->subtask->selectTimeEstimated($values, $errors) ?>
+    <?= $this->subtask->selectTimeSpent($values, $errors) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
     </div>