diff --git a/compositor/PantheonShell.vala b/compositor/PantheonShell.vala
index 7462514b..85c63a40 100644
--- a/compositor/PantheonShell.vala
+++ b/compositor/PantheonShell.vala
@@ -31,8 +31,8 @@ namespace GreeterCompositor {
         wayland_pantheon_shell_interface = {
             get_panel,
             get_widget,
-            get_greeter,
             get_extended_behavior,
+            get_greeter,
         };
 
         wayland_pantheon_panel_interface = {
diff --git a/compositor/protocol/pantheon-desktop-shell-v1.xml b/compositor/protocol/pantheon-desktop-shell-v1.xml
index 0c1da17a..5e8f9922 100644
--- a/compositor/protocol/pantheon-desktop-shell-v1.xml
+++ b/compositor/protocol/pantheon-desktop-shell-v1.xml
@@ -29,14 +29,6 @@
       <arg name="surface" type="object" interface="wl_surface"/>
     </request>
 
-    <request name="get_greeter">
-      <description summary="create a greeter surface from a surface">
-        Create a greeter surface from an existing surface.
-      </description>
-      <arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
-      <arg name="surface" type="object" interface="wl_surface"/>
-    </request>
-
     <request name="get_extended_behavior">
       <description summary="create a desktop-specific surface from a surface">
         Create a desktop-specific surface from an existing surface.
@@ -44,6 +36,14 @@
       <arg name="output" type="new_id" interface="io_elementary_pantheon_extended_behavior_v1"/>
       <arg name="surface" type="object" interface="wl_surface"/>
     </request>
+
+    <request name="get_greeter">
+      <description summary="create a greeter surface from a surface">
+        Create a greeter surface from an existing surface.
+      </description>
+      <arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+    </request>
   </interface>
 
   <interface name="io_elementary_pantheon_panel_v1" version="1">
diff --git a/compositor/protocol/pantheon-desktop-shell.vapi b/compositor/protocol/pantheon-desktop-shell.vapi
index c3b0b9c6..ad4b03a7 100644
--- a/compositor/protocol/pantheon-desktop-shell.vapi
+++ b/compositor/protocol/pantheon-desktop-shell.vapi
@@ -11,9 +11,8 @@ namespace Pantheon.Desktop {
         public static Wl.Interface iface;
         public Pantheon.Desktop.GetPanel get_panel;
         public Pantheon.Desktop.GetWidget get_widget;
-        public Pantheon.Desktop.GetGreeter get_greeter;
         public Pantheon.Desktop.GetExtendedBehavior get_extended_behavior;
-
+        public Pantheon.Desktop.GetGreeter get_greeter;
     }
 
     [CCode (cheader_filename = "pantheon-desktop-shell-server-protocol.h", cname = "enum io_elementary_pantheon_panel_v1_anchor", cprefix="IO_ELEMENTARY_PANTHEON_PANEL_V1_ANCHOR_", has_type_id = false)]
diff --git a/protocol/pantheon-desktop-shell-v1.xml b/protocol/pantheon-desktop-shell-v1.xml
index 0c1da17a..5e8f9922 100644
--- a/protocol/pantheon-desktop-shell-v1.xml
+++ b/protocol/pantheon-desktop-shell-v1.xml
@@ -29,14 +29,6 @@
       <arg name="surface" type="object" interface="wl_surface"/>
     </request>
 
-    <request name="get_greeter">
-      <description summary="create a greeter surface from a surface">
-        Create a greeter surface from an existing surface.
-      </description>
-      <arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
-      <arg name="surface" type="object" interface="wl_surface"/>
-    </request>
-
     <request name="get_extended_behavior">
       <description summary="create a desktop-specific surface from a surface">
         Create a desktop-specific surface from an existing surface.
@@ -44,6 +36,14 @@
       <arg name="output" type="new_id" interface="io_elementary_pantheon_extended_behavior_v1"/>
       <arg name="surface" type="object" interface="wl_surface"/>
     </request>
+
+    <request name="get_greeter">
+      <description summary="create a greeter surface from a surface">
+        Create a greeter surface from an existing surface.
+      </description>
+      <arg name="output" type="new_id" interface="io_elementary_pantheon_greeter_v1"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+    </request>
   </interface>
 
   <interface name="io_elementary_pantheon_panel_v1" version="1">
diff --git a/protocol/pantheon-desktop-shell.vapi b/protocol/pantheon-desktop-shell.vapi
index d9b72ee3..b4b4ee5c 100644
--- a/protocol/pantheon-desktop-shell.vapi
+++ b/protocol/pantheon-desktop-shell.vapi
@@ -14,8 +14,8 @@ namespace Pantheon.Desktop {
         public uint32 get_version ();
         public Pantheon.Desktop.Panel get_panel (Wl.Surface surface);
         public Pantheon.Desktop.Widget get_widget (Wl.Surface surface);
-        public Pantheon.Desktop.Greeter get_greeter (Wl.Surface surface);
         public Pantheon.Desktop.ExtendedBehavior get_extended_behavior (Wl.Surface surface);
+        public Pantheon.Desktop.Greeter get_greeter (Wl.Surface surface);
 
     }
     [CCode (cheader_filename = "pantheon-desktop-shell-client-protocol.h", cname = "enum io_elementary_pantheon_panel_v1_anchor", cprefix="IO_ELEMENTARY_PANTHEON_PANEL_V1_ANCHOR_", has_type_id = false)]