diff --git a/roles/bootstrap/tasks/shift_back.yml b/roles/bootstrap/tasks/shift_back.yml
index 279d3cc..c8df685 100644
--- a/roles/bootstrap/tasks/shift_back.yml
+++ b/roles/bootstrap/tasks/shift_back.yml
@@ -10,3 +10,6 @@
 
 - name: Reboot server proper disabling old user
   reboot:
+  when:
+    - bootstrap_user != "root"
+    - bootstrap_user != bootstrap_expected_user