diff --git a/modules/articles/client/views/create-article.client.view.html b/modules/articles/client/views/create-article.client.view.html
index fd61646138..76148bf19e 100644
--- a/modules/articles/client/views/create-article.client.view.html
+++ b/modules/articles/client/views/create-article.client.view.html
@@ -1,4 +1,4 @@
-<section data-ng-controller="ArticlesController">
+<section ng-controller="ArticlesController">
   <div class="page-header">
     <h1>New Article</h1>
   </div>
@@ -19,8 +19,8 @@ <h1>New Article</h1>
         <div class="form-group">
           <input type="submit" class="btn btn-default">
         </div>
-        <div data-ng-show="error" class="text-danger">
-          <strong data-ng-bind="error"></strong>
+        <div ng-show="error" class="text-danger">
+          <strong ng-bind="error"></strong>
         </div>
       </fieldset>
     </form>
diff --git a/modules/articles/client/views/edit-article.client.view.html b/modules/articles/client/views/edit-article.client.view.html
index 138a74d4a6..1834fb3d17 100644
--- a/modules/articles/client/views/edit-article.client.view.html
+++ b/modules/articles/client/views/edit-article.client.view.html
@@ -1,4 +1,4 @@
-<section data-ng-controller="ArticlesController" data-ng-init="findOne()">
+<section ng-controller="ArticlesController" ng-init="findOne()">
   <div class="page-header">
     <h1>Edit Article</h1>
   </div>
@@ -19,8 +19,8 @@ <h1>Edit Article</h1>
         <div class="form-group">
           <input type="submit" value="Update" class="btn btn-default">
         </div>
-        <div data-ng-show="error" class="text-danger">
-          <strong data-ng-bind="error"></strong>
+        <div ng-show="error" class="text-danger">
+          <strong ng-bind="error"></strong>
         </div>
       </fieldset>
     </form>
diff --git a/modules/articles/client/views/list-articles.client.view.html b/modules/articles/client/views/list-articles.client.view.html
index 689c9c030a..488a4d59e6 100644
--- a/modules/articles/client/views/list-articles.client.view.html
+++ b/modules/articles/client/views/list-articles.client.view.html
@@ -1,20 +1,20 @@
-<section data-ng-controller="ArticlesController" data-ng-init="find()">
+<section ng-controller="ArticlesController" ng-init="find()">
   <div class="page-header">
     <h1>Articles</h1>
   </div>
   <div class="list-group">
-    <a data-ng-repeat="article in articles" data-ui-sref="articles.view({articleId: article._id})" class="list-group-item">
+    <a ng-repeat="article in articles" ui-sref="articles.view({articleId: article._id})" class="list-group-item">
       <small class="list-group-item-text">
         Posted on
-        <span data-ng-bind="article.created | date:'mediumDate'"></span>
+        <span ng-bind="article.created | date:'mediumDate'"></span>
         by
-        <span data-ng-bind="article.user.displayName"></span>
+        <span ng-bind="article.user.displayName"></span>
       </small>
-      <h4 class="list-group-item-heading" data-ng-bind="article.title"></h4>
-      <p class="list-group-item-text" data-ng-bind="article.content"></p>
+      <h4 class="list-group-item-heading" ng-bind="article.title"></h4>
+      <p class="list-group-item-text" ng-bind="article.content"></p>
     </a>
   </div>
-  <div class="alert alert-warning text-center" data-ng-if="articles.$resolved && !articles.length">
-    No articles yet, why don't you <a data-ui-sref="articles.create">create one</a>?
+  <div class="alert alert-warning text-center" ng-if="articles.$resolved && !articles.length">
+    No articles yet, why don't you <a ui-sref="articles.create">create one</a>?
   </div>
 </section>
diff --git a/modules/articles/client/views/view-article.client.view.html b/modules/articles/client/views/view-article.client.view.html
index 83a0c40b89..2ecbb2f484 100644
--- a/modules/articles/client/views/view-article.client.view.html
+++ b/modules/articles/client/views/view-article.client.view.html
@@ -1,22 +1,22 @@
-<section data-ng-controller="ArticlesController" data-ng-init="findOne()">
+<section ng-controller="ArticlesController" ng-init="findOne()">
   <div class="page-header">
-    <h1 data-ng-bind="article.title"></h1>
+    <h1 ng-bind="article.title"></h1>
   </div>
-  <div class="pull-right" data-ng-show="authentication.user._id == article.user._id">
-    <a class="btn btn-primary" data-ui-sref="articles.edit({articleId: article._id})">
+  <div class="pull-right" ng-show="authentication.user._id == article.user._id">
+    <a class="btn btn-primary" ui-sref="articles.edit({articleId: article._id})">
       <i class="glyphicon glyphicon-edit"></i>
     </a>
-    <a class="btn btn-primary" data-ng-click="remove();">
+    <a class="btn btn-primary" ng-click="remove();">
       <i class="glyphicon glyphicon-trash"></i>
     </a>
   </div>
   <small>
     <em class="text-muted">
       Posted on
-      <span data-ng-bind="article.created | date:'mediumDate'"></span>
+      <span ng-bind="article.created | date:'mediumDate'"></span>
       by
-      <span data-ng-bind="article.user.displayName"></span>
+      <span ng-bind="article.user.displayName"></span>
     </em>
   </small>
-  <p class="lead" data-ng-bind="article.content"></p>
+  <p class="lead" ng-bind="article.content"></p>
 </section>
diff --git a/modules/chat/client/views/chat.client.view.html b/modules/chat/client/views/chat.client.view.html
index 7f072c9f22..e751ba4784 100644
--- a/modules/chat/client/views/chat.client.view.html
+++ b/modules/chat/client/views/chat.client.view.html
@@ -1,5 +1,5 @@
 <!-- The chat view -->
-<section class="container" data-ng-controller="ChatController">
+<section class="container" ng-controller="ChatController">
   <div class="page-header">
     <h1>Chat Example</h1>
   </div>
@@ -7,7 +7,7 @@ <h1>Chat Example</h1>
   <form class="col-xs-12 col-md-offset-4 col-md-4" ng-submit="sendMessage();">
     <fieldset class="row">
       <div class="input-group">
-        <input type="text" id="messageText" name="messageText" class="form-control" data-ng-model="messageText" placeholder="Enter new message">
+        <input type="text" id="messageText" name="messageText" class="form-control" ng-model="messageText" placeholder="Enter new message">
         <span class="input-group-btn">
           <button type="submit" class="btn btn-primary">Submit</button>
         </span>
@@ -16,13 +16,13 @@ <h1>Chat Example</h1>
   </form>
   <ul class="list-unstyled">
     <!-- List all messages -->
-    <li class="col-xs-12 col-md-offset-4 col-md-4 chat-message" data-ng-repeat="message in messages">
-      <small class="pull-right text-muted" data-ng-bind="message.created | date:'mediumTime'"></small>
-      <img data-ng-src="{{message.profileImageURL}}" alt="{{message.username}}" class="pull-left chat-profile-image" />
+    <li class="col-xs-12 col-md-offset-4 col-md-4 chat-message" ng-repeat="message in messages">
+      <small class="pull-right text-muted" ng-bind="message.created | date:'mediumTime'"></small>
+      <img ng-src="{{message.profileImageURL}}" alt="{{message.username}}" class="pull-left chat-profile-image" />
       <div class="pull-left chat-message-details">
-        <strong data-ng-bind="message.username"></strong>
+        <strong ng-bind="message.username"></strong>
         <br>
-        <span data-ng-bind="message.text"></span>
+        <span ng-bind="message.text"></span>
       </div>
     </li>
   </ul>
diff --git a/modules/core/client/css/core.css b/modules/core/client/css/core.css
index 2cbf0af6cf..88950ddafb 100644
--- a/modules/core/client/css/core.css
+++ b/modules/core/client/css/core.css
@@ -6,7 +6,6 @@
 }
 [ng\:cloak],
 [ng-cloak],
-[data-ng-cloak],
 [x-ng-cloak],
 .ng-cloak,
 .x-ng-cloak {
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index 94d2dd9aee..dd2bc4edde 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -1,52 +1,52 @@
-<div class="container" data-ng-controller="HeaderController">
+<div class="container" ng-controller="HeaderController">
   <div class="navbar-header">
-    <button class="navbar-toggle" type="button" data-ng-click="toggleCollapsibleMenu()">
+    <button class="navbar-toggle" type="button" ng-click="toggleCollapsibleMenu()">
       <span class="sr-only">Toggle navigation</span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
     </button>
-    <a data-ui-sref="home" class="navbar-brand">MEAN.JS</a>
+    <a ui-sref="home" class="navbar-brand">MEAN.JS</a>
   </div>
   <nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
-    <ul class="nav navbar-nav" data-ng-if="menu.shouldRender(authentication.user);">
-      <li data-ng-repeat="item in menu.items | orderBy: 'position'" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.type" data-ng-class="{ active: $state.includes(item.state), dropdown: item.type === 'dropdown' }" class="{{item.class}}" dropdown="item.type === 'dropdown'">
+    <ul class="nav navbar-nav" ng-if="menu.shouldRender(authentication.user);">
+      <li ng-repeat="item in menu.items | orderBy: 'position'" ng-if="item.shouldRender(authentication.user);" ng-switch="item.type" ng-class="{ active: $state.includes(item.state), dropdown: item.type === 'dropdown' }" class="{{item.class}}" dropdown="item.type === 'dropdown'">
         <a ng-switch-when="dropdown" class="dropdown-toggle" dropdown-toggle role="button">{{::item.title}}&nbsp;<span class="caret"></span></a>
         <ul ng-switch-when="dropdown" class="dropdown-menu">
-          <li data-ng-repeat="subitem in item.items | orderBy: 'position'" data-ng-if="subitem.shouldRender(authentication.user);" data-ui-sref-active="active">
-            <a data-ui-sref="{{subitem.state}}" data-ng-bind="subitem.title"></a>
+          <li ng-repeat="subitem in item.items | orderBy: 'position'" ng-if="subitem.shouldRender(authentication.user);" ui-sref-active="active">
+            <a ui-sref="{{subitem.state}}" ng-bind="subitem.title"></a>
           </li>
         </ul>
-        <a ng-switch-default data-ui-sref="{{item.state}}" data-ng-bind="item.title"></a>
+        <a ng-switch-default ui-sref="{{item.state}}" ng-bind="item.title"></a>
       </li>
     </ul>
-    <ul class="nav navbar-nav navbar-right" data-ng-hide="authentication.user">
-      <li data-ui-sref-active="active">
-        <a data-ui-sref="authentication.signup">Sign Up</a>
+    <ul class="nav navbar-nav navbar-right" ng-hide="authentication.user">
+      <li ui-sref-active="active">
+        <a ui-sref="authentication.signup">Sign Up</a>
       </li>
       <li class="divider-vertical"></li>
-      <li data-ui-sref-active="active">
-        <a data-ui-sref="authentication.signin">Sign In</a>
+      <li ui-sref-active="active">
+        <a ui-sref="authentication.signin">Sign In</a>
       </li>
     </ul>
-    <ul class="nav navbar-nav navbar-right" data-ng-show="authentication.user">
+    <ul class="nav navbar-nav navbar-right" ng-show="authentication.user">
       <li class="dropdown" dropdown>
         <a class="dropdown-toggle user-header-dropdown-toggle" dropdown-toggle role="button">
-          <img data-ng-src="{{authentication.user.profileImageURL}}" alt="{{authentication.user.displayName}}" class="header-profile-image" />
-          <span data-ng-bind="authentication.user.displayName"></span> <b class="caret"></b>
+          <img ng-src="{{authentication.user.profileImageURL}}" alt="{{authentication.user.displayName}}" class="header-profile-image" />
+          <span ng-bind="authentication.user.displayName"></span> <b class="caret"></b>
         </a>
         <ul class="dropdown-menu" role="menu">
-          <li data-ui-sref-active="active">
-            <a data-ui-sref="settings.profile">Edit Profile</a>
+          <li ui-sref-active="active">
+            <a ui-sref="settings.profile">Edit Profile</a>
           </li>
-          <li data-ui-sref-active="active">
-            <a data-ui-sref="settings.picture">Change Profile Picture</a>
+          <li ui-sref-active="active">
+            <a ui-sref="settings.picture">Change Profile Picture</a>
           </li>
-          <li data-ui-sref-active="active" data-ng-show="authentication.user.provider === 'local'">
-            <a data-ui-sref="settings.password">Change Password</a>
+          <li ui-sref-active="active" ng-show="authentication.user.provider === 'local'">
+            <a ui-sref="settings.password">Change Password</a>
           </li>
-          <li data-ui-sref-active="active">
-            <a data-ui-sref="settings.accounts">Manage Social Accounts</a>
+          <li ui-sref-active="active">
+            <a ui-sref="settings.accounts">Manage Social Accounts</a>
           </li>
           <li class="divider"></li>
           <li>
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index 61f24912ad..efba7eef2e 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -1,4 +1,4 @@
-<section data-ng-controller="HomeController">
+<section ng-controller="HomeController">
   <div class="jumbotron text-center">
     <div class="row">
       <div class="col-md-6 col-md-offset-3 col-sm-6 col-sm-offset-3 col-xs-12">
diff --git a/modules/core/server/views/index.server.view.html b/modules/core/server/views/index.server.view.html
index 8a94dc81b1..262a52ec95 100644
--- a/modules/core/server/views/index.server.view.html
+++ b/modules/core/server/views/index.server.view.html
@@ -1,5 +1,5 @@
 {% extends 'layout.server.view.html' %}
 
 {% block content %}
-  <section data-ui-view></section>
+  <section ui-view></section>
 {% endblock %}
diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html
index 590776071e..c10f4e62d8 100644
--- a/modules/core/server/views/layout.server.view.html
+++ b/modules/core/server/views/layout.server.view.html
@@ -36,7 +36,7 @@
 </head>
 
 <body class="ng-cloak">
-  <header data-ng-include="'/modules/core/client/views/header.client.view.html'" class="navbar navbar-fixed-top navbar-inverse"></header>
+  <header ng-include="'/modules/core/client/views/header.client.view.html'" class="navbar navbar-fixed-top navbar-inverse"></header>
   <section class="content">
     <section class="container">
       {% block content %}{% endblock %}
diff --git a/modules/users/client/views/admin/user-edit.client.view.html b/modules/users/client/views/admin/user-edit.client.view.html
index d09286c50b..6a2795f625 100644
--- a/modules/users/client/views/admin/user-edit.client.view.html
+++ b/modules/users/client/views/admin/user-edit.client.view.html
@@ -28,8 +28,8 @@ <h1>User <span ng-bind="user.username"></span></h1>
         <div class="form-group">
           <input type="submit" value="Update" class="btn btn-default">
         </div>
-        <div data-ng-show="error" class="text-danger">
-          <strong data-ng-bind="error"></strong>
+        <div ng-show="error" class="text-danger">
+          <strong ng-bind="error"></strong>
         </div>
       </fieldset>
     </form>
diff --git a/modules/users/client/views/admin/user-list.client.view.html b/modules/users/client/views/admin/user-list.client.view.html
index 47b146c776..4ef28d4b40 100644
--- a/modules/users/client/views/admin/user-list.client.view.html
+++ b/modules/users/client/views/admin/user-list.client.view.html
@@ -5,14 +5,14 @@
         <h1>Users</h1>
       </div>
       <div class="col-md-4" style="margin-top: 2em">
-        <input class="form-control col-md-4" type="text" data-ng-model="search" placeholder="Search" ng-change="figureOutItemsToDisplay()" />
+        <input class="form-control col-md-4" type="text" ng-model="search" placeholder="Search" ng-change="figureOutItemsToDisplay()" />
       </div>
     </div>
   </div>
   <div class="list-group">
-    <a data-ng-repeat="user in pagedItems" data-ui-sref="admin.user({userId: user._id})" class="list-group-item">
-      <h4 class="list-group-item-heading" data-ng-bind="user.username"></h4>
-      <p class="list-group-item-text" data-ng-bind="user.email"></p>
+    <a ng-repeat="user in pagedItems" ui-sref="admin.user({userId: user._id})" class="list-group-item">
+      <h4 class="list-group-item-heading" ng-bind="user.username"></h4>
+      <p class="list-group-item-text" ng-bind="user.email"></p>
     </a>
   </div>
 
diff --git a/modules/users/client/views/admin/user.client.view.html b/modules/users/client/views/admin/user.client.view.html
index 366f852f71..491c5a0deb 100644
--- a/modules/users/client/views/admin/user.client.view.html
+++ b/modules/users/client/views/admin/user.client.view.html
@@ -2,13 +2,13 @@
   <div class="page-header">
     <div class="row">
       <div class="col-md-6">
-        <h1 data-ng-bind="user.username"></h1>
+        <h1 ng-bind="user.username"></h1>
       </div>
       <div class="col-md-4">
-        <a class="btn btn-primary" data-ui-sref="admin.user-edit({userId: user._id})">
+        <a class="btn btn-primary" ui-sref="admin.user-edit({userId: user._id})">
           <i class="glyphicon glyphicon-edit"></i>
         </a>
-        <a class="btn btn-primary" data-ng-click="remove();" ng-if="user._id !== authentication.user._id">
+        <a class="btn btn-primary" ng-click="remove();" ng-if="user._id !== authentication.user._id">
           <i class="glyphicon glyphicon-trash"></i>
         </a>
       </div>
@@ -19,32 +19,32 @@ <h1 data-ng-bind="user.username"></h1>
     <div class="col-md-8">
       <div class="row">
         <div class="col-md-3"><strong>First Name</strong></div>
-        <div class="col-md-6" data-ng-bind="user.firstName"></div>
+        <div class="col-md-6" ng-bind="user.firstName"></div>
       </div>
       <hr/>
       <div class="row">
         <div class="col-md-3"><strong>Last Name</strong></div>
-        <div class="col-md-6" data-ng-bind="user.lastName"></div>
+        <div class="col-md-6" ng-bind="user.lastName"></div>
       </div>
       <hr/>
       <div class="row">
         <div class="col-md-3"><strong>Email</strong></div>
-        <div class="col-md-6" data-ng-bind="user.email"></div>
+        <div class="col-md-6" ng-bind="user.email"></div>
       </div>
       <hr/>
       <div class="row">
         <div class="col-md-3"><strong>Provider</strong></div>
-        <div class="col-md-6" data-ng-bind="user.provider"></div>
+        <div class="col-md-6" ng-bind="user.provider"></div>
       </div>
       <hr/>
       <div class="row">
         <div class="col-md-3"><strong>Created</strong></div>
-        <div class="col-md-6" data-ng-bind="user.created"></div>
+        <div class="col-md-6" ng-bind="user.created"></div>
       </div>
       <hr/>
       <div class="row">
         <div class="col-md-3"><strong>Roles</strong></div>
-        <div class="col-md-6" data-ng-bind="user.roles"></div>
+        <div class="col-md-6" ng-bind="user.roles"></div>
       </div>
     </div>
   </div>
diff --git a/modules/users/client/views/authentication/authentication.client.view.html b/modules/users/client/views/authentication/authentication.client.view.html
index 698a4d5199..6dbd41c491 100644
--- a/modules/users/client/views/authentication/authentication.client.view.html
+++ b/modules/users/client/views/authentication/authentication.client.view.html
@@ -1,4 +1,4 @@
-<section class="row" data-ng-controller="AuthenticationController">
+<section class="row" ng-controller="AuthenticationController">
   <h3 class="col-md-12 text-center">Sign in using your social accounts</h3>
   <div class="col-md-12 text-center">
     <img ng-click="callOauthProvider('/api/auth/facebook')" ng-src="/modules/users/client/img/buttons/facebook.png">
diff --git a/modules/users/client/views/authentication/signin.client.view.html b/modules/users/client/views/authentication/signin.client.view.html
index 02d836fb9f..ff0f8c49f8 100644
--- a/modules/users/client/views/authentication/signin.client.view.html
+++ b/modules/users/client/views/authentication/signin.client.view.html
@@ -1,4 +1,4 @@
-<div data-ng-controller="AuthenticationController">
+<div ng-controller="AuthenticationController">
   <h3 class="col-md-12 text-center">Or with your account</h3>
   <div class="col-xs-offset-2 col-xs-8 col-md-offset-4 col-md-4">
     <form name="userForm" ng-submit="signin(userForm.$valid)" class="signin" novalidate autocomplete="off">
@@ -20,13 +20,13 @@ <h3 class="col-md-12 text-center">Or with your account</h3>
         <div class="text-center form-group">
           <button type="submit" class="btn btn-primary">Sign in</button>
           &nbsp; or&nbsp;
-          <a data-ui-sref="authentication.signup">Sign up</a>
+          <a ui-sref="authentication.signup">Sign up</a>
         </div>
         <div class="text-center forgot-password">
-          <a data-ui-sref="password.forgot">Forgot your password?</a>
+          <a ui-sref="password.forgot">Forgot your password?</a>
         </div>
-        <alert type="danger" data-ng-show="error" class="text-center text-danger">
-          <span data-ng-bind="error"></span>
+        <alert type="danger" ng-show="error" class="text-center text-danger">
+          <span ng-bind="error"></span>
         </alert>
       </fieldset>
     </form>
diff --git a/modules/users/client/views/authentication/signup.client.view.html b/modules/users/client/views/authentication/signup.client.view.html
index 12c4a7e3e7..842d77a8ac 100644
--- a/modules/users/client/views/authentication/signup.client.view.html
+++ b/modules/users/client/views/authentication/signup.client.view.html
@@ -1,4 +1,4 @@
-<div data-ng-controller="AuthenticationController">
+<div ng-controller="AuthenticationController">
   <h3 class="col-md-12 text-center">Or sign up using your email</h3>
   <div class="col-xs-offset-2 col-xs-8 col-md-offset-4 col-md-4">
     <form name="userForm" ng-submit="signup(userForm.$valid)" class="signin" novalidate autocomplete="off">
@@ -43,10 +43,10 @@ <h3 class="col-md-12 text-center">Or sign up using your email</h3>
         <div class="text-center form-group">
           <button type="submit" class="btn btn-large btn-primary">Sign up</button>
           &nbsp; or&nbsp;
-          <a data-ui-sref="authentication.signin" class="show-signup">Sign in</a>
+          <a ui-sref="authentication.signin" class="show-signup">Sign in</a>
         </div>
-        <div data-ng-show="error" class="text-center text-danger">
-          <strong data-ng-bind="error"></strong>
+        <div ng-show="error" class="text-center text-danger">
+          <strong ng-bind="error"></strong>
         </div>
       </fieldset>
     </form>
diff --git a/modules/users/client/views/password/forgot-password.client.view.html b/modules/users/client/views/password/forgot-password.client.view.html
index 793b7a0f58..9e39699118 100644
--- a/modules/users/client/views/password/forgot-password.client.view.html
+++ b/modules/users/client/views/password/forgot-password.client.view.html
@@ -1,19 +1,19 @@
-<section class="row" data-ng-controller="PasswordController">
+<section class="row" ng-controller="PasswordController">
     <h3 class="col-md-12 text-center">Restore your password</h3>
     <p class="small text-center">Enter your account username.</p>
     <div class="col-xs-offset-2 col-xs-8 col-md-offset-5 col-md-2">
-        <form data-ng-submit="askForPasswordReset()" class="form-horizontal" autocomplete="off">
+        <form ng-submit="askForPasswordReset()" class="form-horizontal" autocomplete="off">
             <fieldset>
         <div class="form-group">
-          <input type="text" id="username" name="username" class="form-control" data-ng-model="credentials.username" placeholder="Username">
+          <input type="text" id="username" name="username" class="form-control" ng-model="credentials.username" placeholder="Username">
         </div>
                 <div class="text-center form-group">
                     <button type="submit" class="btn btn-primary">Submit</button>
                 </div>
-                <div data-ng-show="error" class="text-center text-danger">
+                <div ng-show="error" class="text-center text-danger">
                     <strong>{{error}}</strong>
                 </div>
-                <div data-ng-show="success" class="text-center text-success">
+                <div ng-show="success" class="text-center text-success">
                     <strong>{{success}}</strong>
                 </div>
             </fieldset>
diff --git a/modules/users/client/views/password/reset-password-invalid.client.view.html b/modules/users/client/views/password/reset-password-invalid.client.view.html
index 2c44e89420..11b7f63388 100644
--- a/modules/users/client/views/password/reset-password-invalid.client.view.html
+++ b/modules/users/client/views/password/reset-password-invalid.client.view.html
@@ -1,4 +1,4 @@
 <section class="row text-center">
   <h3 class="col-md-12">Password reset is invalid</h3>
-  <a data-ui-sref="password.forgot" class="col-md-12">Ask for a new password reset</a>
+  <a ui-sref="password.forgot" class="col-md-12">Ask for a new password reset</a>
 </section>
diff --git a/modules/users/client/views/password/reset-password-success.client.view.html b/modules/users/client/views/password/reset-password-success.client.view.html
index 252a879448..80da65eacc 100644
--- a/modules/users/client/views/password/reset-password-success.client.view.html
+++ b/modules/users/client/views/password/reset-password-success.client.view.html
@@ -1,4 +1,4 @@
 <section class="row text-center">
   <h3 class="col-md-12">Password successfully reset</h3>
-  <a data-ui-sref="home" class="col-md-12">Continue to home page</a>
+  <a ui-sref="home" class="col-md-12">Continue to home page</a>
 </section>
diff --git a/modules/users/client/views/password/reset-password.client.view.html b/modules/users/client/views/password/reset-password.client.view.html
index bdd0611a73..acbf0629be 100644
--- a/modules/users/client/views/password/reset-password.client.view.html
+++ b/modules/users/client/views/password/reset-password.client.view.html
@@ -1,23 +1,23 @@
-<section class="row" data-ng-controller="PasswordController">
+<section class="row" ng-controller="PasswordController">
     <h3 class="col-md-12 text-center">Reset your password</h3>
     <div class="col-xs-offset-2 col-xs-8 col-md-offset-5 col-md-2">
-        <form data-ng-submit="resetUserPassword()" class="signin form-horizontal" autocomplete="off">
+        <form ng-submit="resetUserPassword()" class="signin form-horizontal" autocomplete="off">
             <fieldset>
                 <div class="form-group">
                     <label for="newPassword">New Password</label>
-                    <input type="password" id="newPassword" name="newPassword" class="form-control" data-ng-model="passwordDetails.newPassword" placeholder="New Password">
+                    <input type="password" id="newPassword" name="newPassword" class="form-control" ng-model="passwordDetails.newPassword" placeholder="New Password">
                 </div>
                 <div class="form-group">
                     <label for="verifyPassword">Verify Password</label>
-                    <input type="password" id="verifyPassword" name="verifyPassword" class="form-control" data-ng-model="passwordDetails.verifyPassword" placeholder="Verify Password">
+                    <input type="password" id="verifyPassword" name="verifyPassword" class="form-control" ng-model="passwordDetails.verifyPassword" placeholder="Verify Password">
                 </div>
                 <div class="text-center form-group">
                     <button type="submit" class="btn btn-lg btn-primary">Update Password</button>
                 </div>
-                <div data-ng-show="error" class="text-center text-danger">
+                <div ng-show="error" class="text-center text-danger">
                     <strong>{{error}}</strong>
                 </div>
-                <div data-ng-show="success" class="text-center text-success">
+                <div ng-show="success" class="text-center text-success">
                     <strong>{{success}}</strong>
                 </div>
             </fieldset>
diff --git a/modules/users/client/views/settings/change-password.client.view.html b/modules/users/client/views/settings/change-password.client.view.html
index 3ea89b03ef..d4e94b7780 100644
--- a/modules/users/client/views/settings/change-password.client.view.html
+++ b/modules/users/client/views/settings/change-password.client.view.html
@@ -1,4 +1,4 @@
-<section class="row" data-ng-controller="ChangePasswordController">
+<section class="row" ng-controller="ChangePasswordController">
   <div class="col-xs-offset-1 col-xs-10 col-md-offset-4 col-md-4">
     <form name="passwordForm" ng-submit="changeUserPassword(passwordForm.$valid)" class="signin" novalidate autocomplete="off">
       <fieldset>
@@ -26,11 +26,11 @@
         <div class="text-center form-group">
           <button type="submit" class="btn btn-lg btn-primary">Save Password</button>
         </div>
-        <div data-ng-show="success" class="text-center text-success">
+        <div ng-show="success" class="text-center text-success">
           <strong>Password Changed Successfully</strong>
         </div>
-        <div data-ng-show="error" class="text-center text-danger">
-          <strong data-ng-bind="error"></strong>
+        <div ng-show="error" class="text-center text-danger">
+          <strong ng-bind="error"></strong>
         </div>
       </fieldset>
     </form>
diff --git a/modules/users/client/views/settings/change-profile-picture.client.view.html b/modules/users/client/views/settings/change-profile-picture.client.view.html
index 17085f3d99..b632fee748 100644
--- a/modules/users/client/views/settings/change-profile-picture.client.view.html
+++ b/modules/users/client/views/settings/change-profile-picture.client.view.html
@@ -1,24 +1,24 @@
-<section class="row" data-ng-controller="ChangeProfilePictureController">
+<section class="row" ng-controller="ChangeProfilePictureController">
   <div class="col-xs-offset-1 col-xs-10 col-md-offset-3 col-md-4">
     <form class="signin form-horizontal">
       <fieldset>
         <div class="form-group text-center">
-          <img data-ng-src="{{imageURL}}" alt="{{user.displayName}}" class="img-thumbnail user-profile-picture">
+          <img ng-src="{{imageURL}}" alt="{{user.displayName}}" class="img-thumbnail user-profile-picture">
         </div>
-        <div class="text-center form-group" data-ng-hide="uploader.queue.length">
+        <div class="text-center form-group" ng-hide="uploader.queue.length">
           <span class="btn btn-default btn-file">
               Select Image <input type="file" nv-file-select uploader="uploader">
           </span>
         </div>
-        <div class="text-center form-group" data-ng-show="uploader.queue.length">
-          <button class="btn btn-primary" data-ng-click="uploadProfilePicture();">Upload</button>
-          <button class="btn btn-default" data-ng-click="cancelUpload();">Cancel</button>
+        <div class="text-center form-group" ng-show="uploader.queue.length">
+          <button class="btn btn-primary" ng-click="uploadProfilePicture();">Upload</button>
+          <button class="btn btn-default" ng-click="cancelUpload();">Cancel</button>
         </div>
-        <div data-ng-show="success" class="text-center text-success">
+        <div ng-show="success" class="text-center text-success">
           <strong>Profile Picture Changed Successfully</strong>
         </div>
-        <div data-ng-show="error" class="text-center text-danger">
-          <strong data-ng-bind="error"></strong>
+        <div ng-show="error" class="text-center text-danger">
+          <strong ng-bind="error"></strong>
         </div>
       </fieldset>
     </form>
diff --git a/modules/users/client/views/settings/edit-profile.client.view.html b/modules/users/client/views/settings/edit-profile.client.view.html
index d47a4b692e..c263587870 100644
--- a/modules/users/client/views/settings/edit-profile.client.view.html
+++ b/modules/users/client/views/settings/edit-profile.client.view.html
@@ -1,4 +1,4 @@
-<section class="row" data-ng-controller="EditProfileController">
+<section class="row" ng-controller="EditProfileController">
   <div class="col-xs-offset-1 col-xs-10 col-md-offset-4 col-md-4">
     <form name="userForm" ng-submit="updateUserProfile(userForm.$valid)" class="signin" novalidate autocomplete="off">
       <fieldset>
@@ -34,11 +34,11 @@
         <div class="text-center form-group">
           <button type="submit" class="btn btn-lg btn-primary">Save Profile</button>
         </div>
-        <div data-ng-show="success" class="text-center text-success">
+        <div ng-show="success" class="text-center text-success">
           <strong>Profile Saved Successfully</strong>
         </div>
-        <div data-ng-show="error" class="text-center text-danger">
-          <strong data-ng-bind="error"></strong>
+        <div ng-show="error" class="text-center text-danger">
+          <strong ng-bind="error"></strong>
         </div>
       </fieldset>
     </form>
diff --git a/modules/users/client/views/settings/manage-social-accounts.client.view.html b/modules/users/client/views/settings/manage-social-accounts.client.view.html
index 39d9c431b0..0296e288a8 100644
--- a/modules/users/client/views/settings/manage-social-accounts.client.view.html
+++ b/modules/users/client/views/settings/manage-social-accounts.client.view.html
@@ -1,46 +1,46 @@
-<section class="row" data-ng-controller="SocialAccountsController">
-  <h3 class="col-md-12 text-center" data-ng-show="hasConnectedAdditionalSocialAccounts()">Connected social accounts:</h3>
+<section class="row" ng-controller="SocialAccountsController">
+  <h3 class="col-md-12 text-center" ng-show="hasConnectedAdditionalSocialAccounts()">Connected social accounts:</h3>
   <div class="col-md-12 text-center">
-    <div data-ng-repeat="(providerName, providerData) in user.additionalProvidersData" class="social-account-container">
+    <div ng-repeat="(providerName, providerData) in user.additionalProvidersData" class="social-account-container">
       <img ng-src="/modules/users/client/img/buttons/{{providerName}}.png">
-      <a class="btn btn-danger btn-remove-account" data-ng-click="removeUserSocialAccount(providerName)">
+      <a class="btn btn-danger btn-remove-account" ng-click="removeUserSocialAccount(providerName)">
         <i class="glyphicon glyphicon-trash"></i>
       </a>
     </div>
   </div>
-  <h3 class="col-md-12 text-center" data-ng-show="hasConnectedAdditionalSocialAccounts()">Unconnected social accounts:</h3>
+  <h3 class="col-md-12 text-center" ng-show="hasConnectedAdditionalSocialAccounts()">Unconnected social accounts:</h3>
   <div class="col-md-12 text-center">
-    <div class="social-account-container" data-ng-hide="isConnectedSocialAccount('facebook')">
+    <div class="social-account-container" ng-hide="isConnectedSocialAccount('facebook')">
       <img ng-src="/modules/users/client/img/buttons/facebook.png">
       <a class="btn btn-success btn-remove-account" href="/api/auth/facebook" target="_self">
         <i class="glyphicon glyphicon-plus"></i>
       </a>
     </div>
-    <div class="social-account-container" data-ng-hide="isConnectedSocialAccount('twitter')">
+    <div class="social-account-container" ng-hide="isConnectedSocialAccount('twitter')">
       <img ng-src="/modules/users/client/img/buttons/twitter.png">
       <a class="btn btn-success btn-remove-account" href="/api/auth/twitter" target="_self">
         <i class="glyphicon glyphicon-plus"></i>
       </a>
     </div>
-    <div class="social-account-container" data-ng-hide="isConnectedSocialAccount('google')">
+    <div class="social-account-container" ng-hide="isConnectedSocialAccount('google')">
       <img ng-src="/modules/users/client/img/buttons/google.png">
       <a class="btn btn-success btn-remove-account" href="/api/auth/google" target="_self">
         <i class="glyphicon glyphicon-plus"></i>
       </a>
     </div>
-    <div class="social-account-container" data-ng-hide="isConnectedSocialAccount('linkedin')">
+    <div class="social-account-container" ng-hide="isConnectedSocialAccount('linkedin')">
       <img ng-src="/modules/users/client/img/buttons/linkedin.png">
       <a class="btn btn-success btn-remove-account" href="/api/auth/linkedin" target="_self">
         <i class="glyphicon glyphicon-plus"></i>
       </a>
     </div>
-    <div class="social-account-container" data-ng-hide="isConnectedSocialAccount('github')">
+    <div class="social-account-container" ng-hide="isConnectedSocialAccount('github')">
       <img ng-src="/modules/users/client/img/buttons/github.png">
       <a class="btn btn-success btn-remove-account" href="/api/auth/github" target="_self">
         <i class="glyphicon glyphicon-plus"></i>
       </a>
     </div>
-    <div class="social-account-container" data-ng-hide="isConnectedSocialAccount('paypal')">
+    <div class="social-account-container" ng-hide="isConnectedSocialAccount('paypal')">
       <img ng-src="/modules/users/client/img/buttons/paypal.png">
       <a class="btn btn-success btn-remove-account" href="/api/auth/paypal" target="_self">
         <i class="glyphicon glyphicon-plus"></i>
diff --git a/modules/users/client/views/settings/settings.client.view.html b/modules/users/client/views/settings/settings.client.view.html
index 8d5bd8c0b1..9aab3234c2 100644
--- a/modules/users/client/views/settings/settings.client.view.html
+++ b/modules/users/client/views/settings/settings.client.view.html
@@ -1,26 +1,26 @@
-<section data-ng-controller="SettingsController">
+<section ng-controller="SettingsController">
   <div class="page-header">
     <h1>Settings</h1>
   </div>
   <div class="row">
     <nav class="col-sm-3 col-md-3">
       <ul class="nav nav-pills nav-stacked">
-        <li data-ui-sref-active="active">
-          <a data-ui-sref="settings.profile">Edit Profile</a>
+        <li ui-sref-active="active">
+          <a ui-sref="settings.profile">Edit Profile</a>
         </li>
-        <li data-ui-sref-active="active">
-          <a data-ui-sref="settings.picture">Change Profile Picture</a>
+        <li ui-sref-active="active">
+          <a ui-sref="settings.picture">Change Profile Picture</a>
         </li>
-        <li data-ui-sref-active="active" data-ng-show="user.provider === 'local'">
-          <a data-ui-sref="settings.password">Change Password</a>
+        <li ui-sref-active="active" ng-show="user.provider === 'local'">
+          <a ui-sref="settings.password">Change Password</a>
         </li>
-        <li data-ui-sref-active="active">
-          <a data-ui-sref="settings.accounts">Manage Social Accounts</a>
+        <li ui-sref-active="active">
+          <a ui-sref="settings.accounts">Manage Social Accounts</a>
         </li>
       </ul>
     </nav>
     <div class="col-sm-9 col-md-8 settings-view">
-      <div data-ui-view></div>
+      <div ui-view></div>
     </div>
   </div>
 </section>