diff --git a/src/components/dialog/edit-user.js b/src/components/dialog/edit-user.js
index a779725..c8bb203 100644
--- a/src/components/dialog/edit-user.js
+++ b/src/components/dialog/edit-user.js
@@ -98,8 +98,9 @@ class EditUserDialog extends Component {
           <FormGroup controlId="role" validationState={this.validateForm('role')}>
             <ControlLabel>Role</ControlLabel>
             <FormControl componentClass="select" placeholder="Select role" value={this.state.role} onChange={(e) => this.handleChange(e)}>
-              <option key='1' value='admin'>Admin</option>
-              <option key='2' disabled value='operator'>Operator</option>
+              <option key='1' value='admin'>Administrator</option>
+              <option key='2' value='user'>User</option>
+              <option key='3' value='guest'>Guest</option>
             </FormControl>
           </FormGroup>
         </form>
diff --git a/src/components/dialog/new-user.js b/src/components/dialog/new-user.js
index 690f17d..f666e31 100644
--- a/src/components/dialog/new-user.js
+++ b/src/components/dialog/new-user.js
@@ -95,8 +95,9 @@ class NewUserDialog extends Component {
           <FormGroup controlId="role" validationState={this.validateForm('role')}>
             <ControlLabel>Role</ControlLabel>
             <FormControl componentClass="select" placeholder="Select role" value={this.state.role} onChange={(e) => this.handleChange(e)}>
-              <option key='1' value='admin'>Admin</option>
-              <option key='2' disabled value='operator'>Operator</option>
+              <option key='1' value='admin'>Administrator</option>
+              <option key='2' value='user'>User</option>
+              <option key='3' value='guest'>Guest</option>
             </FormControl>
           </FormGroup>
         </form>
diff --git a/src/containers/users.js b/src/containers/users.js
index 91f720c..288c4f4 100644
--- a/src/containers/users.js
+++ b/src/containers/users.js
@@ -94,6 +94,12 @@ class Users extends Component {
     }
   }
 
+  getHumanRoleName(role_key) {
+    const HUMAN_ROLE_NAMES = {admin: 'Administrator', user: 'User', guest: 'Guest'};
+    
+    return HUMAN_ROLE_NAMES.hasOwnProperty(role_key)? HUMAN_ROLE_NAMES[role_key] : '';
+  }
+
   render() {
 
     return (
@@ -103,7 +109,7 @@ class Users extends Component {
         <Table data={this.state.users}>
           <TableColumn title='Username' width='150' dataKey='username' />
           <TableColumn title='E-mail' dataKey='mail'  />
-          <TableColumn title='Role' dataKey='role'  />
+          <TableColumn title='Role' dataKey='role'   modifier={(role) => this.getHumanRoleName(role)} />
           <TableColumn width='70' editButton deleteButton onEdit={index => this.setState({ editModal: true, modalData: this.state.users[index] })} onDelete={index => this.setState({ deleteModal: true, modalData: this.state.users[index] })} />
         </Table>