diff --git a/src/user/edit-user.js b/src/user/edit-user.js
index 59cafc7..d8ef87c 100644
--- a/src/user/edit-user.js
+++ b/src/user/edit-user.js
@@ -35,7 +35,8 @@ class EditUserDialog extends React.Component {
       mail: '',
       role: '',
       id: '',
-      password: ''
+      password: '',
+      active: ''
     }
   }
 
@@ -56,7 +57,8 @@ class EditUserDialog extends React.Component {
     var username = true;
     var role = true;
     var mail = true;
-    var pw = true
+    var pw = true;
+    var active = true;
 
     if (this.state.username === '') {
       username = false;
@@ -74,8 +76,12 @@ class EditUserDialog extends React.Component {
       pw = false;
     }
 
+    if(this.state.active === ''){
+      active = false;
+    }
+
     // form is valid if any of the fields contain somethig
-    this.valid = username || role || mail || pw;
+    this.valid = username || role || mail || pw || active;
 
   }
 
@@ -113,6 +119,15 @@ class EditUserDialog extends React.Component {
               <option key='3' value='Guest'>Guest</option>
             </FormControl>
           </FormGroup>
+
+          <FormGroup as={Col} controlId="active">
+            <FormLabel>Active</FormLabel>
+            <FormControl as="select" placeholder="Select Active state" value={this.state.active} onChange={(e) => this.handleChange(e)}>
+              <option key='1' value='yes'>Yes</option>
+              <option key='2' value='no'>No</option>
+            </FormControl>
+          </FormGroup>
+
         </form>
       </Dialog>
     );
diff --git a/src/user/users.js b/src/user/users.js
index 304412f..6981f6e 100644
--- a/src/user/users.js
+++ b/src/user/users.js
@@ -126,6 +126,7 @@ class Users extends Component {
           <TableColumn title='ID' width='150' dataKey='id' />
           <TableColumn title='E-mail' dataKey='mail'  />
           <TableColumn title='Role' dataKey='role'   modifier={(role) => this.getHumanRoleName(role)} />
+          <TableColumn title='Active' dataKey='active' />
           <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>