diff --git a/src/actions/loadUser.js b/src/actions/loadUser.js
index 305570049..4d693f2de 100644
--- a/src/actions/loadUser.js
+++ b/src/actions/loadUser.js
@@ -9,7 +9,11 @@ import {
   ROLE_CONNECT_COPILOT,
   ROLE_TOPCODER_USER,
   ROLE_CONNECT_MANAGER,
-  ROLE_CONNECT_ADMIN
+  ROLE_CONNECT_ADMIN,
+  ROLE_ACCOUNT_EXECUTIVE,
+  ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+  ROLE_PROGRAM_MANAGER,
+  ROLE_PRESALES, ROLE_PROJECT_MANAGER, ROLE_SOLUTION_ARCHITECT
 } from '../config/constants'
 import { getFreshToken, configureConnector, decodeToken } from 'tc-accounts'
 import { getUserProfile } from '../api/users'
@@ -55,7 +59,19 @@ export function loadUserSuccess(dispatch, token) {
       currentUser = _.assign(currentUser, profile)
       // determine user role
       let userRole
-      if (_.indexOf(currentUser.roles, ROLE_ADMINISTRATOR) > -1) {
+      if (_.indexOf(currentUser.roles, ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE) > -1) {
+        userRole = ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE
+      } else if (_.indexOf(currentUser.roles, ROLE_PRESALES) > -1) {
+        userRole = ROLE_PRESALES
+      } else if (_.indexOf(currentUser.roles, ROLE_ACCOUNT_EXECUTIVE) > -1) {
+        userRole = ROLE_ACCOUNT_EXECUTIVE
+      } else if (_.indexOf(currentUser.roles, ROLE_PROGRAM_MANAGER) > -1) {
+        userRole = ROLE_PROGRAM_MANAGER
+      } else if (_.indexOf(currentUser.roles, ROLE_PROJECT_MANAGER) > -1) {
+        userRole = ROLE_PROJECT_MANAGER
+      } else if (_.indexOf(currentUser.roles, ROLE_SOLUTION_ARCHITECT) > -1) {
+        userRole = ROLE_SOLUTION_ARCHITECT
+      } else if (_.indexOf(currentUser.roles, ROLE_ADMINISTRATOR) > -1) {
         userRole = ROLE_ADMINISTRATOR
       } else if (_.indexOf(currentUser.roles, ROLE_CONNECT_ADMIN) > -1) {
         userRole = ROLE_CONNECT_ADMIN
diff --git a/src/components/TeamManagement/Dialog.js b/src/components/TeamManagement/Dialog.js
index cec0c2137..294b211ec 100644
--- a/src/components/TeamManagement/Dialog.js
+++ b/src/components/TeamManagement/Dialog.js
@@ -21,6 +21,18 @@ class Dialog extends React.Component {
     }, {
       title: 'Account Manager',
       value: 'account_manager',
+    }, {
+      title: 'Account Executive',
+      value: 'account_executive',
+    }, {
+      title: 'Program Manager',
+      value: 'program_manager',
+    }, {
+      title: 'Solution Architect',
+      value: 'solution_architect',
+    }, {
+      title: 'Project Manager',
+      value: 'project_manager',
     }]
 
     this.handleRoles = this.handleRoles.bind(this)
diff --git a/src/components/TeamManagement/TeamManagement.scss b/src/components/TeamManagement/TeamManagement.scss
index 83ffb5822..2f043d94c 100644
--- a/src/components/TeamManagement/TeamManagement.scss
+++ b/src/components/TeamManagement/TeamManagement.scss
@@ -144,6 +144,7 @@
         }
 
         .project-member-layout {
+          flex-wrap: wrap;
           min-height: 60px;
           padding: $base-unit*2 $base-unit*4;
           display: flex;
@@ -247,7 +248,8 @@
           }
 
           .member-role-container {
-            margin-left: $base-unit*3;
+            margin-left: $base-unit*12;
+            width: 100%;
             display: flex;
             padding: 1px;
             border-radius: 5px;
@@ -473,4 +475,4 @@
 
 .title-text {
   letter-spacing: 0.8px
-}
\ No newline at end of file
+}