diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index d5a52787..610fffdf 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -30,6 +30,7 @@ module Admin
     def edit; end
 
     def destroy
+      sign_out @user
       @user.destroy
       redirect_to admin_users_path, notice: 'User got deleted'
     end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index e19a0a18..8731cbb3 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -54,6 +54,12 @@ class RegistrationsController < Devise::RegistrationsController
     end
   end
 
+  def destroy
+    sign_out current_user
+    current_user.destroy
+    redirect_to root_path
+  end
+
   protected
 
   def after_update_path_for(resource)
diff --git a/app/models/event.rb b/app/models/event.rb
index 92bfeb15..5cb9c4ba 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -205,7 +205,6 @@ class Event < ActiveRecord::Base
       end
     alert
   end
-
   private
 
   def abstract_limit
diff --git a/app/models/event_user.rb b/app/models/event_user.rb
index 2f71d330..be44a003 100644
--- a/app/models/event_user.rb
+++ b/app/models/event_user.rb
@@ -5,4 +5,10 @@ class EventUser < ActiveRecord::Base
 
   belongs_to :event
   belongs_to :user
+
+  def self.create_deleted_eventuser(user,event)
+    event_role = event.event_users.where(user: user).first.event_role
+    event.event_users.where(user: user).destroy_all
+    EventUser.create(user: User.find_by(email: 'deleted@localhost.osem'), event: event, event_role: event_role)
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 02d61183..88cbf054 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -122,6 +122,21 @@ class User < ActiveRecord::Base
     end
   end
 
+  def destroy
+    if self.events.blank?
+      super
+    else
+      self.events.each do |event|
+        if event.start_time.nil? || event.start_time > DateTime.now
+          event.destroy
+        else
+          EventUser.create_deleted_eventuser(self,event)
+        end
+      end
+      super
+    end
+  end
+
   private
 
   def biography_limit
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index dd004b4a..032c7d8e 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -53,4 +53,14 @@
                   disabled: true, class: 'btn btn-primary disabled btn-danger', role: 'button'
                 - else
                   = link_to 'Delete',admin_user_path(user), method: :delete,
-                  data: { confirm: 'Are you sure ?' }, class: 'btn btn-primary btn-danger'
+                  data: { confirm: 'Are you sure ?' }, class: 'btn btn-primary btn-danger', id: "user-delete-#{user.id}"
+
+
+:javascript
+  $(document).ready(function() {
+      $('#users').dataTable( {
+        "bPaginate": false,
+        "bLengthChange": false
+      } );
+  } );
+>>>>>>> User deletion
diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
index b7714d18..578d8fe7 100644
--- a/app/views/devise/registrations/edit.html.haml
+++ b/app/views/devise/registrations/edit.html.haml
@@ -33,3 +33,4 @@
         = f.input :current_password, input_html: {autocomplete: 'off'},
           hint: '(we need your current password to confirm password or email changes)'
       = f.action :submit, as: :button, label: 'Update', button_html: {class: 'btn btn-primary'}
+      = link_to 'Delete', registration_path(resource_name), method: :delete , data: { confirm: 'Are you sure ?'},class: "btn btn-primary btn-danger"
diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb
index 6a7b12f6..e105cbf1 100644
--- a/spec/features/user_spec.rb
+++ b/spec/features/user_spec.rb
@@ -5,15 +5,28 @@ feature User do
   shared_examples 'admin ability' do
     scenario 'deletes a user', feature: true, js: true do
       sign_in(create(:admin))
+      @user = create(:user)
       visit admin_users_path
       expected_count = User.count - 1
-      page.all('btn btn-primary btn-danger') do
-        click_link 'Delete'
-        page.evaluate_script('window.confirm = function() { return true; }')
-        page.click('OK')
-        expect(flash).to eq('User got deleted')
-        expect(User.count).to eq(expected_count)
-      end
+      find("#user-delete-#{@user.id}").click
+      page.evaluate_script('window.confirm = function() { return true; }')
+      expect(flash).to eq('User got deleted')
+      expect(User.count).to eq(expected_count)
+      sign_out
+    end
+    scenario 'deletes a user with scheduled events', feature: true, js: true do
+      sign_in(create(:admin))
+      @user = create(:user)
+      deleted_user = create(:user, email: 'deleted@localhost.osem', name: 'User deleted', biography: 'Data is no longer available for deleted user.')
+      @user.events << create(:event, start_time: DateTime.now)
+      event = @user.events.first
+      visit admin_users_path
+      expected_count = User.count - 1
+      find("#user-delete-#{@user.id}").click
+      page.evaluate_script('window.confirm = function() { return true; }')
+      expect(flash).to eq('User got deleted')
+      expect(User.count).to eq(expected_count)
+      expect(event.event_users.map{|x| User.find(x.user_id)}).to include(deleted_user)
       sign_out
     end
   end