diff --git a/src/modules/displaymanager/displaymanager.conf b/src/modules/displaymanager/displaymanager.conf
new file mode 100644
index 000000000..63e868260
--- /dev/null
+++ b/src/modules/displaymanager/displaymanager.conf
@@ -0,0 +1,12 @@
+---
+#The DM module attempts to set up all the DMs found in this list, in that precise order.
+#It also sets up autologin, if the feature is enabled in globalstorage.
+#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
+displaymanagers:
+  - slim
+  - sddm
+  - lightdm
+  - gdm
+  - mdm
+  - lxdm
+  - kdm
diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
new file mode 100644
index 000000000..246a1a177
--- /dev/null
+++ b/src/modules/displaymanager/main.py
@@ -0,0 +1,332 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+# === This file is part of Calamares - <http://github.com/calamares> ===
+#
+#   Copyright 2014, Philip Müller <philm@manjaro.org>
+#   Copyright 2014, 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 os
+import libcalamares
+
+
+def set_autologin(username, displaymanagers, root_mount_point):
+    """ Enables automatic login for the installed desktop managers """
+
+    if "mdm" in displaymanagers:
+        # Systems with MDM as Desktop Manager
+        mdm_conf_path = os.path.join(root_mount_point, "etc/mdm/custom.conf")
+        if os.path.exists(mdm_conf_path):
+            with open(mdm_conf_path, 'r') as mdm_conf:
+                text = mdm_conf.readlines()
+            with open(mdm_conf_path, 'w') as mdm_conf:
+                for line in text:
+                    if '[daemon]' in line:
+                        line = '[daemon]\nAutomaticLogin=%s\nAutomaticLoginEnable=True\n' % username
+                    mdm_conf.write(line)
+        else:
+            with open(mdm_conf_path, 'w') as mdm_conf:
+                mdm_conf.write(
+                    '# Calamares - Enable automatic login for user\n')
+                mdm_conf.write('[daemon]\n')
+                mdm_conf.write('AutomaticLogin=%s\n' % username)
+                mdm_conf.write('AutomaticLoginEnable=True\n')
+
+    if "gdm" in displaymanagers:
+        # Systems with GDM as Desktop Manager
+        gdm_conf_path = os.path.join(root_mount_point, "etc/gdm/custom.conf")
+        if os.path.exists(gdm_conf_path):
+            with open(gdm_conf_path, 'r') as gdm_conf:
+                text = gdm_conf.readlines()
+            with open(gdm_conf_path, 'w') as gdm_conf:
+                for line in text:
+                    if '[daemon]' in line:
+                        line = '[daemon]\nAutomaticLogin=%s\nAutomaticLoginEnable=True\n' % username
+                    gdm_conf.write(line)
+        else:
+            with open(gdm_conf_path, 'w') as gdm_conf:
+                gdm_conf.write(
+                    '# Calamares - Enable automatic login for user\n')
+                gdm_conf.write('[daemon]\n')
+                gdm_conf.write('AutomaticLogin=%s\n' % username)
+                gdm_conf.write('AutomaticLoginEnable=True\n')
+
+    if "kdm" in displaymanagers:
+        # Systems with KDM as Desktop Manager
+        kdm_conf_path = os.path.join(
+            root_mount_point, "usr/share/config/kdm/kdmrc")
+        text = []
+        if os.path.exists(kdm_conf_path):
+            with open(kdm_conf_path, 'r') as kdm_conf:
+                text = kdm_conf.readlines()
+            with open(kdm_conf_path, 'w') as kdm_conf:
+                for line in text:
+                    if '#AutoLoginEnable=true' in line:
+                        line = 'AutoLoginEnable=true\n'
+                    if 'AutoLoginUser=' in line:
+                        line = 'AutoLoginUser=%s\n' % username
+                    kdm_conf.write(line)
+        else:
+            return "Cannot write KDM configuration file", "KDM config file %s does not exist" % kdm_conf_path
+
+    if "lxdm" in displaymanagers:
+        # Systems with LXDM as Desktop Manager
+        lxdm_conf_path = os.path.join(root_mount_point, "etc/lxdm/lxdm.conf")
+        text = []
+        if os.path.exists(lxdm_conf_path):
+            with open(lxdm_conf_path, 'r') as lxdm_conf:
+                text = lxdm_conf.readlines()
+            with open(lxdm_conf_path, 'w') as lxdm_conf:
+                for line in text:
+                    if '# autologin=dgod' in line:
+                        line = 'autologin=%s\n' % username
+                    lxdm_conf.write(line)
+        else:
+            return "Cannot write LXDM configuration file", "LXDM config file %s does not exist" % lxdm_conf_path
+
+    if "lightdm" in displaymanagers:
+        # Systems with LightDM as Desktop Manager
+        # Ideally, we should use configparser for the ini conf file,
+        # but we just do a simple text replacement for now, as it
+        # worksforme(tm)
+        lightdm_conf_path = os.path.join(
+            root_mount_point, "etc/lightdm/lightdm.conf")
+        text = []
+        if os.path.exists(lightdm_conf_path):
+            with open(lightdm_conf_path, 'r') as lightdm_conf:
+                text = lightdm_conf.readlines()
+            with open(lightdm_conf_path, 'w') as lightdm_conf:
+                for line in text:
+                    if '#autologin-user=' in line:
+                        line = 'autologin-user=%s\n' % username
+                    lightdm_conf.write(line)
+        else:
+            return "Cannot write LightDM configuration file", "LightDM config file %s does not exist" % lightdm_conf_path
+
+    if "slim" in displaymanagers:
+        # Systems with Slim as Desktop Manager
+        slim_conf_path = os.path.join(root_mount_point, "etc/slim.conf")
+        text = []
+        if os.path.exists(slim_conf_path):
+            with open(slim_conf_path, 'r') as slim_conf:
+                text = slim_conf.readlines()
+            with open(slim_conf_path, 'w') as slim_conf:
+                for line in text:
+                    if 'auto_login' in line:
+                        line = 'auto_login yes\n'
+                    if 'default_user' in line:
+                        line = 'default_user %s\n' % username
+                    slim_conf.write(line)
+        else:
+            return "Cannot write SLIM configuration file", "SLIM config file %s does not exist" % slim_conf_path
+
+    if "sddm" in displaymanagers:
+        # Systems with Sddm as Desktop Manager
+        sddm_conf_path = os.path.join(root_mount_point, "etc/sddm.conf")
+        text = []
+        if os.path.exists(sddm_conf_path):
+            with open(sddm_conf_path, 'r') as sddm_conf:
+                text = sddm_conf.readlines()
+            with open(sddm_conf_path, 'w') as sddm_conf:
+                for line in text:
+                    if 'User=' in line:
+                        line = 'User={}\n'.format(username)
+                    sddm_conf.write(line)
+        else:
+            return "Cannot write SDDM configuration file", "SDDM config file %s does not exist" % sddm_conf_path
+
+    return None
+
+
+def run():
+    """ Configure display managers """
+    # We acquire a list of displaymanagers, either from config or (overridden) from globalstorage.
+    # This module will try to set up (including autologin) all the displaymanagers in the list, in that specific order.
+    # Most distros will probably only ship one displaymanager.
+    # If a displaymanager is in the list but not installed, this module quits with error.
+
+    if "displaymanagers" in libcalamares.job.configuration:
+        displaymanagers = libcalamares.job.configuration["displaymanagers"]
+
+    if libcalamares.globalstorage.contains("displaymanagers"):
+        displaymanagers = libcalamares.globalstorage.value("displaymanagers")
+
+    if displaymanagers is None:
+        return "No display managers selected for the displaymanager module.",\
+               "The displaymanagers list is empty or undefined in both globalstorage and displaymanager.conf."
+
+    username = libcalamares.globalstorage.value("autologinUser")
+    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
+
+    # Setup slim
+    if "slim" in displaymanagers:
+        if not os.path.exists("%s/usr/bin/slim" % root_mount_point):
+            return "slim selected but not installed", ""
+
+    # Setup sddm
+    if "sddm" in displaymanagers:
+        if not os.path.exists("%s/usr/bin/sddm" % root_mount_point):
+            return "sddm selected but not installed", ""
+
+    # setup lightdm
+    if "lightdm" in displaymanagers:
+        if os.path.exists("%s/usr/bin/lightdm" % root_mount_point):
+            libcalamares.utils.chroot_call(['mkdir', '-p', '/run/lightdm'])
+            libcalamares.utils.chroot_call(['getent', 'group', 'lightdm'])
+            libcalamares.utils.chroot_call(
+                ['groupadd', '-g', '620', 'lightdm'])
+            libcalamares.utils.chroot_call(['getent', 'passwd', 'lightdm'])
+            libcalamares.utils.chroot_call(['useradd', '-c', '"LightDM Display Manager"',
+                                            '-u', '620', '-g', 'lightdm', '-d', '/var/run/lightdm',
+                                            '-s', '/usr/bin/nologin', 'lightdm'])
+            libcalamares.utils.chroot_call(['passwd', '-l', 'lightdm'])
+            libcalamares.utils.chroot_call(
+                ['chown', '-R', 'lightdm:lightdm', '/run/lightdm'])
+            if os.path.exists("%s/usr/bin/startxfce4" % root_mount_point):
+                os.system(
+                    "sed -i -e 's/^.*user-session=.*/user-session=xfce/' %s/etc/lightdm/lightdm.conf" % root_mount_point)
+            libcalamares.utils.chroot_call(['ln', '-s',
+                                            '/usr/lib/lightdm/lightdm/gdmflexiserver',
+                                            '/usr/bin/gdmflexiserver'])
+            libcalamares.utils.chroot_call(
+                ['chmod', '+r' '/etc/lightdm/lightdm.conf'])
+        else:
+            return "lightdm selected but not installed", ""
+
+    # Setup gdm
+    if "gdm" in displaymanagers:
+        if os.path.exists("%s/usr/bin/gdm" % root_mount_point):
+            libcalamares.utils.chroot_call(['getent', 'group', 'gdm'])
+            libcalamares.utils.chroot_call(['groupadd', '-g', '120', 'gdm'])
+            libcalamares.utils.chroot_call(['getent', 'passwd', 'gdm'])
+            libcalamares.utils.chroot_call(['useradd', '-c', '"Gnome Display Manager"',
+                                            '-u', '120', '-g', 'gdm', '-d', '/var/lib/gdm',
+                                            '-s', '/usr/bin/nologin', 'gdm'])
+            libcalamares.utils.chroot_call(['passwd', '-l', 'gdm'])
+            libcalamares.utils.chroot_call(
+                ['chown', '-R', 'gdm:gdm', '/var/lib/gdm'])
+            if os.path.exists("%s/var/lib/AccountsService/users" % root_mount_point):
+                os.system(
+                    "echo \"[User]\" > %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+            if os.path.exists("%s/usr/bin/startxfce4" % root_mount_point):
+                os.system(
+                    "echo \"XSession=xfce\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+            if os.path.exists("%s/usr/bin/cinnamon-session" % root_mount_point):
+                os.system(
+                    "echo \"XSession=cinnamon-session\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+            if os.path.exists("%s/usr/bin/mate-session" % root_mount_point):
+                os.system(
+                    "echo \"XSession=mate\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+            if os.path.exists("%s/usr/bin/enlightenment_start" % root_mount_point):
+                os.system(
+                    "echo \"XSession=enlightenment\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+            if os.path.exists("%s/usr/bin/openbox-session" % root_mount_point):
+                os.system(
+                    "echo \"XSession=openbox\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+            if os.path.exists("%s/usr/bin/lxsession" % root_mount_point):
+                os.system(
+                    "echo \"XSession=LXDE\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+            os.system(
+                "echo \"Icon=\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
+        else:
+            return "gdm selected but not installed", ""
+
+    # Setup mdm
+    if "mdm" in displaymanagers:
+        if os.path.exists("%s/usr/bin/mdm" % root_mount_point):
+            libcalamares.utils.chroot_call(['getent', 'group', 'mdm'])
+            libcalamares.utils.chroot_call(['groupadd', '-g', '128', 'mdm'])
+            libcalamares.utils.chroot_call(['getent', 'passwd', 'mdm'])
+            libcalamares.utils.chroot_call(['useradd', '-c', '"Linux Mint Display Manager"',
+                                            '-u', '128', '-g', 'mdm', '-d', '/var/lib/mdm',
+                                            '-s', '/usr/bin/nologin', 'mdm'])
+            libcalamares.utils.chroot_call(['passwd', '-l', 'mdm'])
+            libcalamares.utils.chroot_call(
+                ['chown', 'root:mdm', '/var/lib/mdm'])
+            libcalamares.utils.chroot_call(['chmod', '1770', '/var/lib/mdm'])
+            if os.path.exists("%s/usr/bin/startxfce4" % root_mount_point):
+                os.system(
+                    "sed -i 's|default.desktop|xfce.desktop|g' %s/etc/mdm/custom.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/cinnamon-session" % root_mount_point):
+                os.system(
+                    "sed -i 's|default.desktop|cinnamon.desktop|g' %s/etc/mdm/custom.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/openbox-session" % root_mount_point):
+                os.system(
+                    "sed -i 's|default.desktop|openbox.desktop|g' %s/etc/mdm/custom.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/mate-session" % root_mount_point):
+                os.system(
+                    "sed -i 's|default.desktop|mate.desktop|g' %s/etc/mdm/custom.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/lxsession" % root_mount_point):
+                os.system(
+                    "sed -i 's|default.desktop|LXDE.desktop|g' %s/etc/mdm/custom.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/enlightenment_start" % root_mount_point):
+                os.system(
+                    "sed -i 's|default.desktop|enlightenment.desktop|g' %s/etc/mdm/custom.conf" % root_mount_point)
+        else:
+            return "mdm selected but not installed", ""
+
+    # Setup lxdm
+    if "lxdm" in displaymanagers:
+        if os.path.exists("%s/usr/bin/lxdm" % root_mount_point):
+            libcalamares.utils.chroot_call(['groupadd', '--system', 'lxdm'])
+            if os.path.exists("%s/usr/bin/startxfce4" % root_mount_point):
+                os.system(
+                    "sed -i -e 's|^.*session=.*|session=/usr/bin/startxfce4|' %s/etc/lxdm/lxdm.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/cinnamon-session" % root_mount_point):
+                os.system(
+                    "sed -i -e 's|^.*session=.*|session=/usr/bin/cinnamon-session|' %s/etc/lxdm/lxdm.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/mate-session" % root_mount_point):
+                os.system(
+                    "sed -i -e 's|^.*session=.*|session=/usr/bin/mate-session|' %s/etc/lxdm/lxdm.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/enlightenment_start" % root_mount_point):
+                os.system(
+                    "sed -i -e 's|^.*session=.*|session=/usr/bin/enlightenment_start|' %s/etc/lxdm/lxdm.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/openbox-session" % root_mount_point):
+                os.system(
+                    "sed -i -e 's|^.*session=.*|session=/usr/bin/openbox-session|' %s/etc/lxdm/lxdm.conf" % root_mount_point)
+            if os.path.exists("%s/usr/bin/lxsession" % root_mount_point):
+                os.system(
+                    "sed -i -e 's|^.*session=.*|session=/usr/bin/lxsession|' %s/etc/lxdm/lxdm.conf" % root_mount_point)
+            libcalamares.utils.chroot_call(
+                ['chgrp', '-R', 'lxdm', '/var/lib/lxdm'])
+            libcalamares.utils.chroot_call(
+                ['chgrp', 'lxdm', '/etc/lxdm/lxdm.conf'])
+            libcalamares.utils.chroot_call(
+                ['chmod', '+r', '/etc/lxdm/lxdm.conf'])
+        else:
+            return "lxdm selected but not installed", ""
+
+    # Setup kdm
+    if "kdm" in displaymanagers:
+        if os.path.exists("%s/usr/bin/kdm" % root_mount_point):
+            libcalamares.utils.chroot_call(['getent', 'group', 'kdm'])
+            libcalamares.utils.chroot_call(['groupadd', '-g', '135', 'kdm'])
+            libcalamares.utils.chroot_call(['getent', 'passwd', 'kdm'])
+            libcalamares.utils.chroot_call(['useradd', '-u', '135', '-g', 'kdm', '-d',
+                                            '/var/lib/kdm', '-s', '/bin/false', '-r', '-M', 'kdm'])
+            libcalamares.utils.chroot_call(
+                ['chown', '-R', '135:135', 'var/lib/kdm'])
+            libcalamares.utils.chroot_call(
+                ['xdg-icon-resource', 'forceupdate', '--theme', 'hicolor'])
+            libcalamares.utils.chroot_call(['update-desktop-database', '-q'])
+        else:
+            return "kdm selected but not installed", ""
+
+    if username != "":
+        libcalamares.utils.debug(
+            "Setting up autologin for user %s." % username)
+        return set_autologin(username, displaymanagers, root_mount_point)
+
+    return None
diff --git a/src/modules/displaymanager/module.desc b/src/modules/displaymanager/module.desc
new file mode 100644
index 000000000..ad7ae4423
--- /dev/null
+++ b/src/modules/displaymanager/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "displaymanager"
+interface:  "python"
+requires:   []
+script:     "main.py"