diff --git a/test/spec/directives/focus-element.directive.js b/test/spec/directives/focus-element.directive.js
index 691e03bb4d..a67af9bc92 100644
--- a/test/spec/directives/focus-element.directive.js
+++ b/test/spec/directives/focus-element.directive.js
@@ -1,6 +1,6 @@
 'use strict';
 
-describe('taskFocus Directive', function() {
+describe('focusElement Directive', function() {
   var elementToFocus, scope;
 
   beforeEach(module('habitrpg'));
@@ -9,7 +9,7 @@ describe('taskFocus Directive', function() {
     scope = $rootScope.$new();
 
     scope.focusThisLink = false;
-    var element = '<input data-task-focus="focusThisLink" />';
+    var element = '<input data-focus-element="focusThisLink" />';
 
     elementToFocus = $compile(element)(scope);
     scope.$digest();
@@ -25,7 +25,7 @@ describe('taskFocus Directive', function() {
       scope.$digest();
 
       $timeout.flush();
-      expect(document.activeElement.dataset.taskFocus).to.eql("focusThisLink");
+      expect(document.activeElement.dataset.focusElement).to.eql("focusThisLink");
       expect(focusSpy).to.have.been.called;
     })
   );
diff --git a/website/public/js/directives/focus-element.directive.js b/website/public/js/directives/focus-element.directive.js
index 00faf89259..bf9a52da4b 100644
--- a/website/public/js/directives/focus-element.directive.js
+++ b/website/public/js/directives/focus-element.directive.js
@@ -3,18 +3,18 @@
 (function(){
   angular
     .module('habitrpg')
-    .directive('taskFocus', taskFocus);
+    .directive('focusElement', focusElement);
 
-  taskFocus.$inject = ['$timeout'];
+  focusElement.$inject = ['$timeout'];
 
   /**
    * Directive that places focus on the element it is applied to when the
    * expression it binds to evaluates to true.
    */
 
-  function taskFocus($timeout) {
+  function focusElement($timeout) {
     return function($scope, elem, attrs) {
-      $scope.$watch(attrs.taskFocus, function(newVal) {
+      $scope.$watch(attrs.focusElement, function(newVal) {
         if (newVal) {
           $timeout(function() {
             elem[0].focus();
diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade
index d14950645d..0b0c6b7693 100644
--- a/website/views/options/social/index.jade
+++ b/website/views/options/social/index.jade
@@ -127,7 +127,7 @@ script(type='text/ng-template', id='modals/copyChatToDo.html')
     .form-group
       input.form-control(type='text',ng-model='text', ng-model-options="{debounce: 1000}")
     .form-group
-      textarea.form-control(rows='5',ng-model='notes', ng-model-options="{debounce: 1000}", task-focus='true')
+      textarea.form-control(rows='5',ng-model='notes', ng-model-options="{debounce: 1000}", focus-element='true')
 
     hr
 
diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade
index 225c594af3..c5e41bea68 100644
--- a/website/views/shared/modals/members.jade
+++ b/website/views/shared/modals/members.jade
@@ -47,7 +47,7 @@ script(type='text/ng-template', id='modals/private-message.html')
   .modal-header
     h4=env.t('pmHeading', {name: "{{profile.profile.name}}"})
   .modal-body
-    textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',placeholder=env.t('needsTextPlaceholder'),ng-model='_message', task-focus='true')
+    textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',placeholder=env.t('needsTextPlaceholder'),ng-model='_message', focus-element='true')
     include ../formatting-help
   .modal-footer
     //- Due to a quirk in Bootstrap UI, we need to wrap this so the tooltip can
diff --git a/website/views/shared/tasks/task_view/add_new.jade b/website/views/shared/tasks/task_view/add_new.jade
index aee14a33b6..c3b06c886c 100644
--- a/website/views/shared/tasks/task_view/add_new.jade
+++ b/website/views/shared/tasks/task_view/add_new.jade
@@ -1,6 +1,6 @@
 form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)', novalidate)
-  textarea(rows='6', task-focus='list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required)
-  input(type='text', task-focus='!list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required)
+  textarea(rows='6', focus-element='list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required)
+  input(type='text', focus-element='!list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required)
   button(type='submit', ng-disabled='new{{list.type}}form.$invalid')
    div.empty-task-notification( ng-show='new{{list.type}}form.$invalid', tooltip=env.t("emptyTask") )
      span.glyphicon.glyphicon-plus