diff --git a/app/Helper/User.php b/app/Helper/User.php
index 000188575..1cad60426 100644
--- a/app/Helper/User.php
+++ b/app/Helper/User.php
@@ -10,6 +10,17 @@ namespace Helper;
  */
 class User extends \Core\Base
 {
+    /**
+     * Get user id
+     *
+     * @access public
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->userSession->getId();
+    }
+
     /**
      * Get user profile
      *
diff --git a/app/Template/task/comments.php b/app/Template/task/comments.php
index f81e0dc9a..a09862f95 100644
--- a/app/Template/task/comments.php
+++ b/app/Template/task/comments.php
@@ -18,7 +18,7 @@
         <?= $this->render('comment/create', array(
                 'skip_cancel' => true,
                 'values' => array(
-                    'user_id' => $this->userSession->getId(),
+                    'user_id' => $this->user->getId(),
                     'task_id' => $task['id'],
                 ),
                 'errors' => array(),
diff --git a/app/Template/twofactor/check.php b/app/Template/twofactor/check.php
index 0e29d526d..68a58a6c7 100644
--- a/app/Template/twofactor/check.php
+++ b/app/Template/twofactor/check.php
@@ -1,4 +1,4 @@
-<form method="post" action="<?= $this->url->href('twofactor', 'check', array('user_id' => $this->userSession->getId())) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('twofactor', 'check', array('user_id' => $this->user->getId())) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->label(t('Code'), 'code') ?>