diff --git a/gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch b/gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch
new file mode 100644
index 0000000..67748b2
--- /dev/null
+++ b/gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch
@@ -0,0 +1,40 @@
+From f4f7b6914ad2b9b0b7da036dde4028751eb49eb7 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 14 Feb 2018 16:07:15 -0500
+Subject: [PATCH 01/16] Revert "session: don't call
+ gdm_session_defaults_changed from setup"
+
+This reverts commit 572a19324b75cc1f1b2db4908e2d7c9f06e4e335.
+
+It turns out we need this call for more than just the session type,
+we also need to it to inform the greeter about the default session
+to use.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=793609
+---
+ daemon/gdm-session.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index 610ebcd0..19d26c92 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -2295,6 +2295,7 @@ gdm_session_setup (GdmSession *self,
+         update_session_type (self);
+ 
+         initialize (self, service_name, NULL, NULL);
++        gdm_session_defaults_changed (self);
+ }
+ 
+ 
+@@ -2313,6 +2314,7 @@ gdm_session_setup_for_user (GdmSession *self,
+ 
+         self->priv->is_program_session = FALSE;
+         initialize (self, service_name, self->priv->selected_user, NULL);
++        gdm_session_defaults_changed (self);
+ }
+ 
+ void
+-- 
+2.12.3
+
diff --git a/gdm.changes b/gdm.changes
index 0cb8de8..46aea6b 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar  2 01:56:52 UTC 2018 - xwang@suse.com
+
+- Add gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch:
+  fix showing right active session of user in login dialog
+  (bsc#1082958 bgo#793609).
+
 -------------------------------------------------------------------
 Thu Mar  1 02:41:45 UTC 2018 - xwang@suse.com
 
diff --git a/gdm.spec b/gdm.spec
index 3c95b2a..0e75d27 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -72,6 +72,8 @@ Patch43:        gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch
 Patch52:        gdm-disable-gnome-initial-setup.patch
 # PATCH-FIX-UPSTREAM gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1075805 bgo#793255 msrb@suse.com -- Add runtime option to start X under root instead of regular user. Necessary if no DRI drivers are present.
 Patch53:        gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch
+# PATCH-FIX-UPSTREAM gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch bsc#1082958 bgo#793609 xwang@suse.com -- Show right active session of user in login dialog.
+Patch54:        gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch
 BuildRequires:  check-devel
 # needed for directory ownership
 BuildRequires:  dconf
@@ -222,6 +224,7 @@ translation-update-upstream
 %patch52 -p1
 %endif
 %patch53 -p1
+%patch54 -p1
 
 %build
 NOCONFIGURE=1 sh autogen.sh