diff --git a/src/modules/removeuser/main.py b/src/modules/removeuser/main.py
new file mode 100644
index 000000000..51150a9a2
--- /dev/null
+++ b/src/modules/removeuser/main.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# === This file is part of Calamares - <http://github.com/calamares> ===
+#
+#   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+#
+#   Calamares is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Calamares is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+
+import subprocess
+import libcalamares
+
+
+def run():
+    """ Remove live user from target system """
+
+    username = libcalamares.job.configuration[("username")]
+    try:
+        libcalamares.utils.check_chroot_call(["userdel", "-f", "-r", username])
+    except subprocess.CalledProcessError as e:
+        libcalamares.utils.debug( "Cannot remove user. " +
+                                  "userdel terminated with exit code {}.".format(e.returncode))
+
+    return None
diff --git a/src/modules/removeuser/module.desc b/src/modules/removeuser/module.desc
new file mode 100644
index 000000000..5c6fc6fb7
--- /dev/null
+++ b/src/modules/removeuser/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "removeuser"
+interface:  "python"
+requires:   []
+script:     "main.py"
diff --git a/src/modules/removeuser/removeuser.conf b/src/modules/removeuser/removeuser.conf
new file mode 100644
index 000000000..a59961ec5
--- /dev/null
+++ b/src/modules/removeuser/removeuser.conf
@@ -0,0 +1,2 @@
+---
+username: live