diff --git a/application/controllers/LimereplacementfieldsController.php b/application/controllers/LimereplacementfieldsController.php
index 7595338341e..4cc41980b8d 100644
--- a/application/controllers/LimereplacementfieldsController.php
+++ b/application/controllers/LimereplacementfieldsController.php
@@ -314,8 +314,8 @@ private function getReplacementFields($fieldtype, $surveyid)
         ) {
             // these 2 fields are supported by email-inv and email-rem
             // but not email-reg for the moment
-            $replFields['EMAIL'] = gT("Participant Email address");
-            $replFields['TOKEN'] = gT("Participant Access code");
+            $replFields['EMAIL'] = gT("Participant - Email address");
+            $replFields['TOKEN'] = gT("Participant - Access code");
             $replFields['OPTOUTURL'] = gT("Participant - Opt-out URL");
             $replFields['OPTINURL'] = gT("Participant - Opt-in URL");
             $replFields['FIRSTNAME'] = gT("Participant - First name");
diff --git a/application/controllers/SurveysGroupsPermissionController.php b/application/controllers/SurveysGroupsPermissionController.php
index 5567dbb8dbf..bc92e03b950 100644
--- a/application/controllers/SurveysGroupsPermissionController.php
+++ b/application/controllers/SurveysGroupsPermissionController.php
@@ -391,7 +391,7 @@ public function actionDeleteUser($id, $uid)
             throw new CHttpException(403, gT("You do not have permission to access this user."));
         }
         if ($uid == App()->user->getId()) {
-            throw new CHttpException(403, gT("You cannot delete your own permissions."));
+            throw new CHttpException(403, gT("You cannot delete your own user."));
         }
         Permission::model()->deleteAll("uid = :uid AND entity_id = :sid AND entity = :entity", array(
             ':uid' => $uid,
diff --git a/application/core/plugins/TwoFactorAdminLogin/TwoFactorAdminLogin.php b/application/core/plugins/TwoFactorAdminLogin/TwoFactorAdminLogin.php
index 70cef6d6eef..d136ae38aaf 100644
--- a/application/core/plugins/TwoFactorAdminLogin/TwoFactorAdminLogin.php
+++ b/application/core/plugins/TwoFactorAdminLogin/TwoFactorAdminLogin.php
@@ -162,7 +162,7 @@ public function newLoginForm()
         $oEvent = $this->getEvent();
         $extraLine = ""
             . "<span>"
-            . "<label for='twofactor'>"  . gT("AuthKey (optional)") . "</label>
+            . "<label for='twofactor'>"  . gT("2FA key (optional)") . "</label>
             <input class='form-control' name='twofactor' id='twofactor' type='text' size='" . $this->get('digits', null, null, 6) . "' maxlength='" . $this->get('digits', null, null, 6) . "' value='' />"
             . "</span>";
 
@@ -373,7 +373,7 @@ public function directCallConfirmKey($oEvent, $oRequest)
         $oTFAModel->setAttributes($aTFAUserKey, false);
         $oTFAModel->firstLogin = 0;
         if (!$oTFAModel->save()) {
-            return $this->createJSONResponse(false, gt("The two-factor authentication key could not be stored."));
+            return $this->createJSONResponse(false, gT("The two-factor authentication key could not be stored."));
         }
 
         return $this->createJSONResponse(true, "2-Factor Method successfully stored", ['reload' => true]);
diff --git a/application/views/SurveysGroupsPermission/subviews/currentUsersList.php b/application/views/SurveysGroupsPermission/subviews/currentUsersList.php
index 9e6e693a170..14fafba413d 100644
--- a/application/views/SurveysGroupsPermission/subviews/currentUsersList.php
+++ b/application/views/SurveysGroupsPermission/subviews/currentUsersList.php
@@ -29,7 +29,7 @@
                         <?php /* @see https://bugs.limesurvey.org/view.php?id=16792 */ ?>
                         <a
                             data-target='#confirmation-modal' data-toggle='modal'
-                            data-message='<?= gT("Are you sure to remove all permissions for this user?") ?>'
+                            data-message='<?= gT("Are you sure you want to remove all permissions for this user?") ?>'
                             data-href='<?= $deleteUrl ?>'
                         ><span class="fa fa-trash text-warning" aria-hidden="true" title="<?= gT("Delete") ?>"><span>
                             <span class="sr-only"><?= gT("Delete") ?></span>
diff --git a/application/views/SurveysGroupsPermission/subviews/viewCurrents.php b/application/views/SurveysGroupsPermission/subviews/viewCurrents.php
index bc4b7bd81a3..0f63613fc46 100644
--- a/application/views/SurveysGroupsPermission/subviews/viewCurrents.php
+++ b/application/views/SurveysGroupsPermission/subviews/viewCurrents.php
@@ -1,6 +1,6 @@
     <div class="well">
-        <p><?= gT("User listed here can see groups in lists and view descriptions and other settings. This is the minimal permission, you have to use delete action to remove this permission.") ?></p>
-        <p><?= gT("This surveys group are shown in list for user with any permission on survey group, user with any permission on one survey inside this group or if this groups was set as available.") ?></p>
+        <p><?= gT("User listed here can see groups in lists, and view group descriptions & settings. This is the minimal permission - you have to use the delete action to remove this permission.") ?></p>
+        <p><?= gT("This survey group is shown for users with any permission on the survey group, user with any permission on one survey inside this group, or if this group was configured to be available.") ?></p>
     </div>
     <?php if(!empty($oExistingUsers)) {
         $this->renderPartial('/SurveysGroupsPermission/subviews/currentUsersList',array(