diff --git a/app/directives/remoteProjectManagerFormDirective.js b/app/directives/remoteProjectManagerFormDirective.js
deleted file mode 100644
index 3ba818b..0000000
--- a/app/directives/remoteProjectManagerFormDirective.js
+++ /dev/null
@@ -1,91 +0,0 @@
-app.directive('remoteProjectManagerForm', function () {
-    return {
-        templateUrl: 'views/directives/remoteProjectManagerForm.html',
-        restrict: 'E',
-        replace: false,
-        scope: {
-            'managementType': '<',
-            'managementSettings': '=',
-            'model': '='
-        },
-        link: function ($scope) {
-
-            $scope.auth = {
-                useToken: false,
-                required: false
-            };
-
-            var originalType;
-
-            var isAuthRequired = function () {
-                $scope.auth.useToken = false;
-                $scope.auth.required = false;
-
-                for (var i in $scope.managementSettings) {
-                    var key = $scope.managementSettings[i].key;
-                    if (key === 'password') {
-                        $scope.auth.required = true;
-                    }
-
-                    if (key === 'token') {
-                        $scope.auth.useToken = true;
-                    }
-                }
-            };
-
-            var refreshAuth = function () {
-                if (originalType === undefined || originalType == $scope.managementType) {
-                    if (originalType === undefined) {
-                        isAuthRequired();
-
-                        originalType = $scope.managementType;
-                    }
-
-                    if ($scope.auth.required) {
-                        $scope.auth.useToken = false;
-
-                        for (var key in $scope.model.settings) {
-                            var value = $scope.model.settings[key];
-
-                            if (key === 'token' && value != undefined && value.length > 0) {
-                                $scope.auth.useToken = true;
-                            }
-                        }
-                    }
-                } else {
-                    isAuthRequired();
-
-                    originalType = $scope.managementType;
-                }
-            };
-
-            $scope.inputSetting = function (setting) {
-                var display = true;
-                if ($scope.auth.useToken) {
-                    if (setting.key === 'username' || setting.key === 'password') {
-                        display = false;
-                    }
-                } else {
-                    if (setting.key === 'token') {
-                        display = false;
-                    }
-                }
-                return display;
-            };
-
-            $scope.clearAuthSettings = function () {
-                for (var key in $scope.model.settings) {
-                    if (key === 'token' || key === 'username' || key === 'password') {
-                        $scope.model.settings[key] = '';
-                    }
-                }
-            };
-
-            refreshAuth();
-
-            $scope.$watch('managementType', function() {
-                refreshAuth();
-            });
-        }
-    };
-});
diff --git a/app/index.html b/app/index.html
index d3155db..d151a9b 100644
--- a/app/index.html
+++ b/app/index.html
@@ -193,7 +193,6 @@
 
   <!-- Directives -->
   <script src="directives/customHeaderDirective.js"></script>
-  <script src="directives/remoteProjectManagerFormDirective.js"></script>
 
   <!-- Services -->
   <script src="services/activeSprintsService.js"></script>
diff --git a/app/repo/remoteProjectManagerRepo.js b/app/repo/remoteProjectManagerRepo.js
index 7a9e6ee..4a0e5f1 100644
--- a/app/repo/remoteProjectManagerRepo.js
+++ b/app/repo/remoteProjectManagerRepo.js
@@ -2,7 +2,9 @@ app.repo("RemoteProjectManagerRepo", function RemoteProjectManagerRepo($q, WsApi
 
     this.scaffold = {
         name: '',
-        type: ''
+        type: '',
+        url: '',
+        token: ''
     };
 
     this.getTypes = function () {
diff --git a/app/views/directives/remoteProjectManagerForm.html b/app/views/directives/remoteProjectManagerForm.html
deleted file mode 100644
index 93d85db..0000000
--- a/app/views/directives/remoteProjectManagerForm.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div ng-repeat="setting in managementSettings" class="form-group" ng-show="inputSetting(setting)">
-  <label for="{{setting.key}}-input">{{setting.gloss}}</label>
-  <input class="form-control" id="{{setting.key}}" type="{{setting.type}}" ng-model="model.settings[setting.key]" placeholder="{{setting.gloss}} for Remote Project Manager" />
-</div>
-<div class="form-group" ng-if="auth.required">
-  <label for="toggle-auth">Auth</label>
-  <div class="checkbox">
-    <label>
-      &nbsp;
-      <input id="toggle-auth" name="toggle-auth" type="checkbox" ng-model="auth.useToken" ng-change="clearAuthSettings()" />Use token auth
-    </label>
-  </div>
-</div>
diff --git a/app/views/management/remoteProjectManager.html b/app/views/management/remoteProjectManager.html
index ed5c6e5..d6d3202 100644
--- a/app/views/management/remoteProjectManager.html
+++ b/app/views/management/remoteProjectManager.html
@@ -6,19 +6,12 @@
   <table class="table table-bordered table-striped remoteProjectManager-table">
     <tr>
       <th>Remote Project Manager</th>
-      <th>Settings</th>
+      <th>URL</th>
       <th class="actions-column text-center">Actions</th>
     </tr>
     <tr ng-repeat="remoteProjectManager in remoteProjectManagers">
       <td title="'Remote Project Manager'">{{remoteProjectManager.name}}</td>
-      <td title="'Settings'">
-        <ul class="list-unstyled">
-          <li ng-repeat="setting in typeSettings(remoteProjectManager.type) | filter:{visible:true}">
-            <label>{{setting.gloss}}:</label>
-            <span>&nbsp;{{remoteProjectManager.settings[setting.key]}}</span>
-          </li>
-        </ul>
-      </td>
+      <td title="'URL'">{{remoteProjectManager.url}}</td>
       <td class="actions-column text-center" title="'Actions'">
         <span class="glyphicon glyphicon-pencil" title="edit" ng-click="editRemoteProjectManager(remoteProjectManager)"></span>
         <span class="glyphicon glyphicon-trash" title="delete" ng-click="confirmDeleteRemoteProjectManager(remoteProjectManager)"></span>
diff --git a/app/views/modals/addRemoteProjectManagerModal.html b/app/views/modals/addRemoteProjectManagerModal.html
index b2efdb0..2557d17 100644
--- a/app/views/modals/addRemoteProjectManagerModal.html
+++ b/app/views/modals/addRemoteProjectManagerModal.html
@@ -14,7 +14,9 @@ <h4 class="modal-title">Create Remote Project Manager</h4>
 
     <validatedselect id="create-type" options="serviceTypes" optionvalue="value" optionproperty="gloss" model="remoteProjectManagerToCreate" property="type" label="Type" form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedselect>
 
-    <remote-project-manager-form ng-if="remoteProjectManagerToCreate.type" management-settings="typeSettings(remoteProjectManagerToCreate.type)" model="remoteProjectManagerToCreate"></remote-project-manager-form>
+    <validatedinput id="edit-url" model="remoteProjectManagerToCreate" property="url" label="URL" placeholder="URL of the Remote Project Manager" form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
+
+    <validatedinput id="edit-token" model="remoteProjectManagerToCreate" type="password" property="token" label="Token" placeholder="Token for the Remote Project Manager" form="remoteProjectManagerForms.create" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
   </div>
 
   <div class="modal-footer">
diff --git a/app/views/modals/editRemoteProjectManagerModal.html b/app/views/modals/editRemoteProjectManagerModal.html
index d884bee..774abb1 100644
--- a/app/views/modals/editRemoteProjectManagerModal.html
+++ b/app/views/modals/editRemoteProjectManagerModal.html
@@ -14,7 +14,9 @@ <h4 class="modal-title">Edit Remote Project Manager</h4>
 
     <validatedselect id="edit-type" options="serviceTypes" optionvalue="value" optionproperty="gloss" model="remoteProjectManagerToEdit" property="type" label="Type" form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedselect>
 
-    <remote-project-manager-form ng-if="remoteProjectManagerToEdit.type" management-type="remoteProjectManagerToEdit.type" management-settings="typeSettings(remoteProjectManagerToEdit.type)" model="remoteProjectManagerToEdit"></remote-project-manager-form>
+    <validatedinput id="edit-url" model="remoteProjectManagerToEdit" property="url" label="URL" placeholder="URL of the Remote Project Manager" form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
+
+    <validatedinput id="edit-token" model="remoteProjectManagerToEdit" type="password" property="token" label="Token" placeholder="Token for the Remote Project Manager" form="remoteProjectManagerForms.edit" validations="remoteProjectManagerForms.validations" results="remoteProjectManagerForms.getResults()"></validatedinput>
   </div>
 
   <div class="modal-footer">
diff --git a/tests/mock/model/mockProduct.js b/tests/mock/model/mockProduct.js
index db35c6e..d17ce81 100644
--- a/tests/mock/model/mockProduct.js
+++ b/tests/mock/model/mockProduct.js
@@ -5,12 +5,9 @@ var dataProduct1 = {
     remoteProjectManager: {
       id: 1,
       name: "Remote Project Manager 1",
-      settings: {
-        password: "password1",
-        url: "url1",
-        username: "username1"
-      },
-      type: "VERSION_ONE"
+      type: "VERSION_ONE",
+      url: "url1",
+      token: "username1:password1"
     },
     scopeId: "scope 1"
   }]
@@ -23,12 +20,9 @@ var dataProduct2 = {
     remoteProjectManager: {
       id: 1,
       name: "Remote Project Manager 1",
-      settings: {
-        password: "password1",
-        url: "url1",
-        username: "username1"
-      },
-      type: "VERSION_ONE"
+      type: "VERSION_ONE",
+      url: "url2",
+      token: "username2:password2"
     },
     scopeId: "scope 2"
   }]
@@ -41,12 +35,9 @@ var dataProduct3 = {
     remoteProjectManager: {
       id: 1,
       name: "Remote Project Manager 1",
-      settings: {
-        password: "password1",
-        url: "url1",
-        username: "username1"
-      },
-      type: "VERSION_ONE"
+      type: "VERSION_ONE",
+      url: "url1",
+      token: "username1:password1"
     },
     scopeId: "scope 3"
   }]
diff --git a/tests/mock/model/mockRemoteProjectManager.js b/tests/mock/model/mockRemoteProjectManager.js
index 5abad38..17be3d6 100644
--- a/tests/mock/model/mockRemoteProjectManager.js
+++ b/tests/mock/model/mockRemoteProjectManager.js
@@ -1,33 +1,24 @@
 var dataRemoteProjectManager1 = {
   id: 1,
   name: "Remote Project Manager 1",
-  settings: {
-    password: "password1",
-    url: "url1",
-    username: "username1"
-  },
+  url: "url1",
+  token: "username1:password1",
   type: "VERSION_ONE"
 };
 
 var dataRemoteProjectManager2 = {
   id: 2,
   name: "Remote Project Manager 2",
-  settings: {
-    password: "password2",
-    url: "url2",
-    username: "username2"
-  },
+  url: "url1",
+  token: "username2:password2",
   type: "VERSION_ONE"
 };
 
 var dataRemoteProjectManager3 = {
   id: 3,
   name: "Remote Project Manager 3",
-  settings: {
-    password: "password3",
-    url: "url3",
-    username: "username3"
-  },
+  url: "url3",
+  token: "username1:password3",
   type: "VERSION_ONE"
 };
 
diff --git a/tests/mock/repo/mockRemoteProjectManagerRepo.js b/tests/mock/repo/mockRemoteProjectManagerRepo.js
index 56c27d1..9890045 100644
--- a/tests/mock/repo/mockRemoteProjectManagerRepo.js
+++ b/tests/mock/repo/mockRemoteProjectManagerRepo.js
@@ -21,7 +21,9 @@ angular.module("mock.remoteProjectManagerRepo", []).service("RemoteProjectManage
 
   repo.scaffold = {
     name: '',
-    type: ''
+    type: '',
+    url: '',
+    token: ''
   };
 
   repo.getTypes = function () {
diff --git a/tests/unit/directives/remoteProjectManagerFormDirectiveTest.js b/tests/unit/directives/remoteProjectManagerFormDirectiveTest.js
deleted file mode 100644
index e355e26..0000000
--- a/tests/unit/directives/remoteProjectManagerFormDirectiveTest.js
+++ /dev/null
@@ -1,106 +0,0 @@
-describe("directive: remoteProjectManagerForm", function () {
-  var $compile, $q, $scope, directive, element;
-
-  var initializeVariables = function () {
-    inject(function (_$q_, _$compile_) {
-      $q = _$q_;
-      $compile = _$compile_;
-    });
-  };
-
-  var initializeDirective = function (settings) {
-    inject(function (_$rootScope_) {
-      $scope = _$rootScope_.$new();
-
-      var attr = settings && settings.attr ? settings.attr : "management-settings='managementSettings' model='model'></remote-project-manager-form";
-      var body = settings && settings.body ? settings.body : "";
-
-      var managementType = settings && settings.managementType ? settings.managementType : "type";
-
-      var managementSettings = settings && settings.managementSettings ? settings.managementSettings : [
-        {
-          type: "text",
-          key: "url",
-          gloss: "URL",
-          visible: true
-        },{
-          type: "text",
-          key: "username",
-          gloss: "Username",
-          visible: false
-        }, {
-          type: "password",
-          key: "password",
-          gloss: "Password",
-          visible: false
-        }, {
-          type: "password",
-          key: "token",
-          gloss: "Token",
-          visible: false
-        }
-      ];
-
-      var model = settings && settings.model ? settings.model : {
-        name: "",
-        type: "",
-        settings: {}
-      };
-
-      element = angular.element("<remote-project-manager-form " + attr + ">" + body + "</remote-project-manager-form>");
-      directive = $compile(element)($scope);
-
-      $scope.managementType = managementType;
-      $scope.managementSettings = managementSettings;
-      $scope.model = model;
-
-      $scope.$digest();
-    });
-  };
-
-  beforeEach(function () {
-    module("core");
-    module("app");
-    module("templates");
-
-    installPromiseMatchers();
-    initializeVariables();
-  });
-
-  describe("Is the directive", function () {
-    it("defined", function () {
-      initializeDirective();
-      expect(directive).toBeDefined();
-    });
-
-    it("defined with token auth", function () {
-      var settings = {
-        model: {
-          name: "",
-          type: "",
-          settings: {
-            token: "1234567890"
-          }
-        }
-      };
-
-      initializeDirective(settings);
-      expect(directive).toBeDefined();
-    });
-
-    it("defined with password auth", function () {
-      var settings = {
-        model: {
-          name: "",
-          type: "",
-          settings: {
-            password: "1234567890"
-          }
-        }
-      };
-
-      initializeDirective(settings);
-      expect(directive).toBeDefined();
-    });
-  });
-});