Merge ~jibel/ubiquity:active_directory into ubiquity:master

[Jean-Baptiste Lallement]

Support for Active directory to the GTK UI.

[Iain Lane (laney)]

Cheers. Looks mostly good code-wise, just a few small-ish comments/questions down there.

I'm going to also request a 'design' review from Matthew. (I guess that for this it would be appreciated if you could upload .debs somewhere maybe...)

review: Needs Fixing

[Jean-Baptiste Lallement (jibel)]

@Laney, thanks for the review.

Here is the design review https://docs.google.com/document/d/1_KEGJa2-ka1oNCzMvLlQg9rNW9JESzHAcgqrjP3DkW4/edit?ts=5f561950#

The comments from mpt have all been addressed.

[Jean-Baptiste Lallement (jibel)]

Branch as been updated.

[Iain Lane (laney)]

Looks ok to me, thanks for the updates.

I'll email mpt to give a design 'approve', should be a quick job given it's already been through review.

One thing though, can you please get seb128 to check all the translations are ok here? It's weird/difficult with ubiquity and Seb's helped me fix things there before.

review: Approve

[Iain Lane (laney)]

I saw this got merged without the two things I requested, but I would still appreciate them happening.

[Matthew Paul Thomas (mpt)]

Thanks for working on the design changes I requested:

❓ Move the Active Directory checkbox down so that it doesn’t look like part of the password group: commented as “Done”, but not shown in the screenshot.

✔ Add an explanatory caption below the checkbox label: Done.

✘ Move the “Test” button to the right of the field to better explain what it was for: Done, but unfortunately at the same time it was renamed to “Test connection”. Ubuntu buttons use Title Case, so this should be either “Test”, or “Test Connection” with a capital C.

✘ If connection fails, tell people to visit ubuntu.com/activedirectory to fix it after installation: Done, but the URL was formatted as a link (perhaps misled by Google Docs auto-linking the URL in my comment). If it’s not actually possible to fix it before installation finishes, people shouldn’t visit the page during installation, so making it a link would be misleading. Also, remember to submit a request for the Web team to set up that URL as a redirect.

review: Needs Fixing (design)

[Iain Lane (laney)]

Thanks mpt.

For me it's OK to follow up on those requests with a separate upload, if you'd prefer to do that, so that the stuff we have now can get out there for testing.

Same with the translations, given Seb is not around right now.

[Jean-Baptiste Lallement (jibel)]

@mpt, thanks for your comment.

1. The AD checkbox has been moved outside of the GtkBox containing the 2 radio buttons. It follows the same space than other pages. padding of 6px for the alignment that contains it, no margin for the widget. However, I added a margin of 6px between the group of radio buttons and the checkbox to make the separation clearer.

3. Fixed.

4. Fixed.

The gdoc has been updated.

[Jean-Baptiste Lallement (jibel)]

PR https://github.com/canonical-web-and-design/ubuntu.com/pull/8282 submitted for the redirect.

[Jean-Baptiste Lallement (jibel)]

submitted https://code.launchpad.net/~jibel/ubiquity/+git/ubiquity-1/+merge/390662 with the updates.

diff --git a/debian/changelog b/debian/changelog
index 286dc17..739798c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubiquity (20.10.10) UNRELEASED; urgency=medium
+
+  [ Didier Roche ]
+  [ Jean-Baptiste Lallement ]
+  * AD integration for GTK UI.
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Tue, 25 Aug 2020 10:06:29 +0200
+
 ubiquity (20.10.9) groovy; urgency=medium
 
   * gtk_ui, prepare: Run 'apt update' before installing OEM metapackages. We
diff --git a/debian/ubiquity.templates b/debian/ubiquity.templates
index 89a32e1..eb6d724 100644
--- a/debian/ubiquity.templates
+++ b/debian/ubiquity.templates
@@ -656,6 +656,10 @@ Template: ubiquity/install/bootloader
 Type: text
 _Description: Configuring boot loader...
 
+Template: ubiquity/install/activedirectory
+Type: text
+_Description: Configuring Active Directory...
+
 Template: ubiquity/install/apt_clone_save
 Type: text
 _Description: Saving installed packages...
@@ -770,6 +774,14 @@ _Description: Error restoring installed applications
  installation will continue, but you may have to manually reinstall some
  applications after the computer reboots.
 
+Template: ubiquity/install/broken_active_directory
+Type: error
+_Description: Error configuring connection to Active Directory
+ Sorry, Active Directory can't be set up at the moment. Once your system is up
+ and running, visit
+ <a href="https://discourse.ubuntu.com/t/service-sssd/11579">ubuntu.com/activedirectory</a>
+ for help.
+
 Template: ubiquity/install/md5_check
 Type: boolean
 Default: true
@@ -1637,4 +1649,72 @@ _Description:
 
 Template: ubiquity/zfs_keystore_key
 Type: password
-_Description: Key to secure the keystore on ZFS installations
 \ No newline at end of file
+_Description: Key to secure the keystore on ZFS installations
+
+Template: ubiquity/login_use_directory
+Type: text
+_Description: Authenticate against a directory
+
+Template: ubiquity/directory_domain
+Type: text
+_Description: Active Directory domain name
+
+Template: ubiquity/directory_user
+Type: text
+_Description: Administrator to join the domain
+
+Template: ubiquity/directory_passwd
+Type: password
+_Description: Administrator password to join the domain
+
+Template: ubiquity/text/login_directory
+Type: text
+_Description:
+ Use Active Directory
+
+Template: ubiquity/text/login_directory_extra_label
+Type: text
+_Description:
+  You'll enter domain and other details in the next step.
+
+Template: ubiquity/text/domain_label
+Type: text
+_Description:
+ Domain:
+
+Template: ubiquity/text/domain_name_error_label
+Type: text
+_Description:
+ You must enter a domain name
+
+Template: ubiquity/text/directory_testbutton
+Type: text
+_Description:
+ Test connection
+
+Template: ubiquity/text/domain_user_label
+Type: text
+_Description:
+ Domain Administrator:
+
+Template: ubiquity/text/domain_user_error_label
+Type: text
+_Description:
+ You must enter a user name
+
+Template: ubiquity/text/domain_passwd_label
+Type: text
+_Description:
+ Password:
+
+Template: ubiquity/text/directory_information_title
+Type: text
+_Description: Configure Active Directory
+
+Template: ubiquity/text/hostname_error
+Type: text
+_Description: That name already exists on the network.
+
+Template: ubiquity/text/domain_connection_error
+Type: text
+_Description: Failed to connect to domain.
diff --git a/gui/gtk/stepUserInfo.ui b/gui/gtk/stepUserInfo.ui
index 9d64ed2..1eee3ad 100644
--- a/gui/gtk/stepUserInfo.ui
+++ b/gui/gtk/stepUserInfo.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.2 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="stepUserInfo">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -19,344 +20,514 @@
       </packing>
     </child>
     <child>
-      <object class="GtkGrid" id="userinfo_table">
+      <object class="GtkNotebook" id="userinfo_notebook">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">20</property>
-        <property name="column_spacing">6</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="fullname_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Your name:</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="username_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pick a username:</property>
-            <property name="justify">right</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="password_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Choose a password:</property>
-            <property name="justify">right</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="verified_password_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Confirm your password:</property>
-            <property name="justify">right</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
-          </packing>
-        </child>
+        <property name="can_focus">True</property>
+        <property name="show_tabs">False</property>
+        <property name="show_border">False</property>
         <child>
-          <object class="GtkBox" id="login_vbox">
+          <object class="GtkGrid" id="userinfo_table">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
+            <property name="border_width">20</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
-              <object class="GtkRadioButton" id="login_auto">
-                <property name="label" translatable="yes">Log in automatically</property>
+              <object class="GtkLabel" id="fullname_label">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">login_pass</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Your name:</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="login_pass">
-                <property name="label" translatable="yes">Require my password to log in</property>
+              <object class="GtkLabel" id="username_label">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="xalign">0</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Pick a username:</property>
+                <property name="justify">right</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="hbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
             <child>
-              <object class="GtkEntry" id="password">
+              <object class="GtkLabel" id="password_label">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
-                <property name="invisible_char">●</property>
-                <property name="activates_default">True</property>
-                <property name="width_chars">20</property>
-                <property name="invisible_char_set">True</property>
-                <accessibility>
-                  <relation type="labelled-by" target="password_label"/>
-                </accessibility>
-                <signal name="changed" handler="info_loop" swapped="no"/>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Choose a password:</property>
+                <property name="justify">right</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="password_strength">
+              <object class="GtkLabel" id="verified_password_label">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkgreen"&gt;Strong password&lt;/span&gt;&lt;/small&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Confirm your password:</property>
+                <property name="justify">right</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="hbox2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
             <child>
-              <object class="GtkEntry" id="verified_password">
+              <object class="GtkBox" id="login_vbox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
-                <property name="invisible_char">●</property>
-                <property name="activates_default">True</property>
-                <property name="width_chars">20</property>
-                <property name="invisible_char_set">True</property>
-                <accessibility>
-                  <relation type="labelled-by" target="verified_password_label"/>
-                </accessibility>
-                <signal name="changed" handler="info_loop" swapped="no"/>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkRadioButton" id="login_auto">
+                    <property name="label" translatable="yes">Log in automatically</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">login_pass</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="login_pass">
+                    <property name="label" translatable="yes">Require my password to log in</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="password_ok">
+              <object class="GtkBox" id="hbox1">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-yes</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="password">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="visibility">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="activates_default">True</property>
+                    <property name="width_chars">20</property>
+                    <signal name="changed" handler="info_loop" swapped="no"/>
+                    <accessibility>
+                      <relation type="labelled-by" target="password_label"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="password_strength">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkgreen"&gt;Strong password&lt;/span&gt;&lt;/small&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="password_error_label">
+              <object class="GtkBox" id="hbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a username&lt;/span&gt;&lt;/small&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="verified_password">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="visibility">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="activates_default">True</property>
+                    <property name="width_chars">20</property>
+                    <signal name="changed" handler="info_loop" swapped="no"/>
+                    <accessibility>
+                      <relation type="labelled-by" target="verified_password_label"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="password_ok">
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-yes</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="password_error_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a username&lt;/span&gt;&lt;/small&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="hbox3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
             <child>
-              <object class="GtkEntry" id="fullname">
+              <object class="GtkBox" id="hbox3">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-                <property name="activates_default">True</property>
-                <property name="width_chars">40</property>
-                <accessibility>
-                  <relation type="labelled-by" target="fullname_label"/>
-                </accessibility>
-                <signal name="changed" handler="info_loop" swapped="no"/>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="fullname">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="activates_default">True</property>
+                    <property name="width_chars">40</property>
+                    <signal name="changed" handler="info_loop" swapped="no"/>
+                    <accessibility>
+                      <relation type="labelled-by" target="fullname_label"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="fullname_ok">
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-yes</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="fullname_ok">
+              <object class="GtkBox" id="username_box">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-yes</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="username">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">32</property>
+                    <property name="invisible_char">•</property>
+                    <property name="activates_default">True</property>
+                    <property name="width_chars">15</property>
+                    <signal name="changed" handler="info_loop" swapped="no"/>
+                    <accessibility>
+                      <relation type="labelled-by" target="username_label"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="username_ok">
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-yes</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="username_error_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a username&lt;/span&gt;&lt;/small&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="username_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
             <child>
-              <object class="GtkEntry" id="username">
+              <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">32</property>
-                <property name="invisible_char">•</property>
-                <property name="activates_default">True</property>
-                <property name="width_chars">15</property>
-                <accessibility>
-                  <relation type="labelled-by" target="username_label"/>
-                </accessibility>
-                <signal name="changed" handler="info_loop" swapped="no"/>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="username_ok">
+              <object class="GtkBox" id="hostname_box">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-yes</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkBox" id="box3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkEntry" id="hostname">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">•</property>
+                        <signal name="changed" handler="info_loop" swapped="no"/>
+                        <accessibility>
+                          <relation type="labelled-by" target="hostname_label"/>
+                          <relation type="labelled-by" target="hostname_extra_label"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="hostname_ok">
+                        <property name="can_focus">False</property>
+                        <property name="stock">gtk-yes</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="hostname_error_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a name&lt;/span&gt;&lt;/small&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="hostname_extra_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">The name it uses when it talks to other computers.</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333333304"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="username_error_label">
+              <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a username&lt;/span&gt;&lt;/small&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>
+                <property name="bottom_padding">20</property>
+                <child>
+                  <object class="GtkLabel" id="hostname_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Your computer's name:</property>
+                    <property name="xalign">1</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkCheckButton" id="login_directory">
+                    <property name="label" translatable="yes">Use Active Directory</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="on_login_directory_toggled" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="login_directory_extra_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes"> You'll enter domain and other details in the next step.</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="scale" value="0.83333333333333304"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">6</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
             <child>
               <placeholder/>
             </child>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-          </packing>
+        </child>
+        <child type="tab">
+          <placeholder/>
         </child>
         <child>
-          <object class="GtkBox" id="hostname_box">
+          <object class="GtkGrid" id="directory_table">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
+            <property name="border_width">20</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
-              <object class="GtkBox" id="box3">
+              <object class="GtkLabel" id="domain_user_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Domain administrator:</property>
+                <property name="justify">right</property>
+                <property name="xalign">1</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="domain_user_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkEntry" id="hostname">
+                  <object class="GtkEntry" id="domain_user">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="max_length">32</property>
                     <property name="invisible_char">•</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="hostname_label"/>
-                      <relation type="labelled-by" target="hostname_extra_label"/>
-                    </accessibility>
-                    <signal name="changed" handler="info_loop" swapped="no"/>
+                    <property name="activates_default">True</property>
+                    <property name="width_chars">15</property>
+                    <signal name="changed" handler="validate_directory_info" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkImage" id="hostname_ok">
+                  <object class="GtkImage" id="domain_user_ok">
                     <property name="can_focus">False</property>
                     <property name="stock">gtk-yes</property>
                   </object>
@@ -367,71 +538,163 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="hostname_error_label">
+                  <object class="GtkLabel" id="domain_user_error_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a name&lt;/span&gt;&lt;/small&gt;</property>
+                    <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a user name&lt;/span&gt;&lt;/small&gt;</property>
                     <property name="use_markup">True</property>
                     <property name="wrap">True</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="hostname_extra_label">
+              <object class="GtkLabel" id="domain_passwd_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">The name it uses when it talks to other computers.</property>
-                <attributes>
-                  <attribute name="scale" value="0.83333333333333304"/>
-                </attributes>
+                <property name="label" translatable="yes">Password:</property>
+                <property name="justify">right</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkAlignment" id="alignment2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="bottom_padding">20</property>
             <child>
-              <object class="GtkLabel" id="hostname_label">
+              <object class="GtkBox" id="di_hbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="domain_passwd">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="visibility">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="activates_default">True</property>
+                    <property name="width_chars">20</property>
+                    <signal name="changed" handler="validate_directory_info" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="domain_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Domain:</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Your computer's name:</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="di_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="domain_name">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <signal name="changed" handler="validate_directory_info" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="directory_testbutton">
+                    <property name="label" translatable="yes">Test connection</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <signal name="clicked" handler="on_testdomain_click" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="domain_name_ok">
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-yes</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="domain_name_error_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;You must enter a domain name&lt;/span&gt;&lt;/small&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="position">1</property>
           </packing>
         </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="fill">False</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/scripts/plugininstall.py b/scripts/plugininstall.py
index e9acdc9..434fd3b 100755
--- a/scripts/plugininstall.py
+++ b/scripts/plugininstall.py
@@ -228,6 +228,10 @@ class Install(install_misc.InstallBase):
         self.configure_zsys()
 
         self.next_region()
+        self.db.progress('INFO', 'ubiquity/install/activedirectory')
+        self.configure_active_directory()
+
+        self.next_region()
         self.db.progress('INFO', 'ubiquity/install/bootloader')
         self.copy_mok()
         self.configure_bootloader()
@@ -968,6 +972,72 @@ class Install(install_misc.InstallBase):
         if use_zfs:
             misc.execute_root('/usr/share/ubiquity/zsys-setup', 'finalize')
 
+    def configure_active_directory(self):
+        """ Join Active Directory domain and enable pam_mkhomedir """
+        use_directory = self.db.get('ubiquity/login_use_directory')
+        if use_directory != 'true':
+            return
+
+        from socket import gethostname
+        hostname_cur = gethostname()
+        hostname_new = ''
+        with open(self.target_file('etc/hostname'), 'r') as f:
+            hostname_new = f.read().strip()
+
+        # Set hostname for AD to determine FQDN (no fqdn option in realm join, only adcli)
+        misc.execute_root('hostname', hostname_new)
+
+        directory_domain = self.db.get('ubiquity/directory_domain')
+        directory_user = self.db.get('ubiquity/directory_user')
+        directory_passwd = self.db.get('ubiquity/directory_passwd')
+
+        binds = ("/proc", "/sys", "/dev", "/run")
+        try:
+            for bind in binds:
+                misc.execute('mount', '--bind', bind, self.target + bind)
+            # join AD on host (services are running on host)
+            if not self.join_domain(hostname_new, directory_domain, directory_user, directory_passwd):
+                self.db.input('critical', 'ubiquity/install/broken_active_directory')
+                self.db.go()
+        finally:
+            for bind in binds:
+                misc.execute('umount', '-f', self.target + bind)
+            # Reset hostname
+            misc.execute_root('hostname', hostname_cur)
+
+        # Enable pam_mkhomedir
+        try:
+            subprocess.check_call(['chroot', self.target, 'pam-auth-update',
+                                   '--package', '--enable', 'mkhomedir'],
+                                  preexec_fn=install_misc.debconf_disconnect)
+        except subprocess.CalledProcessError:
+            self.db.input('critical', 'ubiquity/install/broken_active_directory')
+            self.db.go()
+
+    def join_domain(self, hostname, directory_domain, directory_user, directory_passwd):
+        """ Join an Active Directory domain """
+        log_args = ['log-output', '-t', 'ubiquity']
+        log_args.extend(['realm', 'join', '--install', self.target,
+                         '--user', directory_user, '--computer-name', hostname,
+                         '--unattended', directory_domain])
+        try:
+            p = subprocess.run(log_args, input=directory_passwd, timeout=60, encoding="utf-8")
+        except TimeoutError as e:
+            syslog.syslog(syslog.LOG_ERR, ' '.join(log_args))
+            syslog.syslog(syslog.LOG_ERR, "Command timed out(%s): %s" % (e.errno, e.strerror))
+            return False
+        except IOError as e:
+            syslog.syslog(syslog.LOG_ERR, ' '.join(log_args))
+            syslog.syslog(syslog.LOG_ERR, "OS error(%s): %s" % (e.errno, e.strerror))
+            return False
+
+        if p.returncode != 0:
+            syslog.syslog(syslog.LOG_ERR, ' '.join(log_args))
+            return False
+
+        syslog.syslog(' '.join(log_args))
+        return True
+
     def copy_mok(self):
         if 'UBIQUITY_OEM_USER_CONFIG' in os.environ:
             return
diff --git a/tests/test_usersetup.py b/tests/test_usersetup.py
index 0d6c178..33f4949 100644
--- a/tests/test_usersetup.py
+++ b/tests/test_usersetup.py
@@ -41,6 +41,7 @@ class UserSetupTests(unittest.TestCase):
         error_msg = 'That name already exists on the network.'
         self.gtk.resolver = UbiquityMockResolver.MockResolver(
             hostname='myhostname')
+        self.gtk.plugin_translate('en')
         self.gtk.hostname_ok.show()
         self.gtk.hostname.set_text('myhostname')
         self.gtk.hostname_error = mock.Mock()
diff --git a/ubiquity/components/plugininstall.py b/ubiquity/components/plugininstall.py
index 213b57e..dcb04d6 100644
--- a/ubiquity/components/plugininstall.py
+++ b/ubiquity/components/plugininstall.py
@@ -65,6 +65,8 @@ class Install(FilteredCommand):
             return True
         elif question == 'apt-setup/security-updates-failed':
             fatal = False
+        elif question == 'ubiquity/install/broken_active_directory':
+            fatal = False
         else:
             fatal = True
         self.frontend.error_dialog(self.description(question),
diff --git a/ubiquity/frontend/gtk_ui.py b/ubiquity/frontend/gtk_ui.py
index 7280f96..c3a7dea 100644
--- a/ubiquity/frontend/gtk_ui.py
+++ b/ubiquity/frontend/gtk_ui.py
@@ -1887,14 +1887,22 @@ class Wizard(BaseFrontend):
             msg = title
         dialog = Gtk.MessageDialog(
             self.live_installer, Gtk.DialogFlags.MODAL,
-            Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, msg)
+            Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, "")
         dialog.set_title(title)
+        dialog.set_markup(msg)
+        for label in dialog.get_message_area().get_children():
+            if not isinstance(label, Gtk.Label):
+                continue
+            label.connect('activate-link', self.on_link_clicked)
         dialog.run()
         self.set_busy_cursor(saved_busy_cursor)
         dialog.hide()
         if fatal:
             self.return_to_partitioning()
 
+    def on_link_clicked(self, widget, uri):
+        misc.launch_uri(uri)
+
     def toggle_grub_fail(self, unused_widget):
         if self.grub_no_new_device.get_active():
             self.no_grub_warn.show()
diff --git a/ubiquity/plugins/ubi-usersetup.py b/ubiquity/plugins/ubi-usersetup.py
index 57f2a35..b61d74a 100644
--- a/ubiquity/plugins/ubi-usersetup.py
+++ b/ubiquity/plugins/ubi-usersetup.py
@@ -31,7 +31,7 @@ import re
 
 import debconf
 
-from ubiquity import misc, plugin, validation
+from ubiquity import i18n, misc, plugin, validation
 
 
 NAME = 'usersetup'
@@ -146,6 +146,10 @@ class PageBase(plugin.PluginUI):
     def set_allow_password_empty(self, empty):
         self.allow_password_empty = empty
 
+    def plugin_translate(self, lang):
+        self.hostname_error_text = i18n.get_string('hostname_error', lang)
+        self.domain_connection_error_text = i18n.get_string('domain_connection_error', lang)
+
 
 class PageGtk(PageBase):
     plugin_title = 'ubiquity/text/userinfo_heading_label'
@@ -186,6 +190,19 @@ class PageGtk(PageBase):
         self.password_ok = builder.get_object('password_ok')
         self.password_strength = builder.get_object('password_strength')
 
+        self.login_directory = builder.get_object('login_directory')
+        self.login_directory_extra_label = builder.get_object('login_directory_extra_label')
+        self.domain_name = builder.get_object('domain_name')
+        self.domain_name_ok = builder.get_object('domain_name_ok')
+        self.domain_name_error_label = builder.get_object('domain_name_error_label')
+        self.domain_user = builder.get_object('domain_user')
+        self.domain_user_ok = builder.get_object('domain_user_ok')
+        self.domain_user_error_label = builder.get_object('domain_user_error_label')
+        self.domain_passwd = builder.get_object('domain_passwd')
+        self.directory_testbutton = builder.get_object('directory_testbutton')
+
+        self.userinfo_notebook = builder.get_object('userinfo_notebook')
+
         # Dodgy hack to let us center the contents of the page without it
         # moving as elements appear and disappear, specifically the full name
         # okay check icon and the hostname error messages.
@@ -204,6 +221,11 @@ class PageGtk(PageBase):
         self.hostname_changed_id = self.hostname.connect(
             'changed', self.on_hostname_changed)
 
+        if not os.path.exists('/usr/sbin/realm'):
+            self.login_directory.hide()
+            self.login_directory_extra_label.hide()
+        self.login_directory_extra_label.set_sensitive(False)
+
         if self.controller.oem_config:
             self.fullname.set_text('OEM Configuration (temporary user)')
             self.fullname.set_editable(False)
@@ -272,11 +294,41 @@ class PageGtk(PageBase):
     def set_hostname(self, value):
         self.hostname.set_text(value)
 
+    def get_login_directory(self):
+        """ Use a directory for authentication """
+        return self.login_directory.get_active()
+
+    def get_domain_name(self):
+        """ Get the domain name """
+        return self.domain_name.get_text()
+
+    def get_domain_user(self):
+        """ Get the domain name """
+        return self.domain_user.get_text()
+
+    def get_domain_passwd(self):
+        """ Get the domain name """
+        return self.domain_passwd.get_text()
+
+    def domain_name_error(self, msg):
+        self.domain_name_ok.hide()
+        m = '<small><span foreground="darkred"><b>%s</b></span></small>' % msg
+        self.domain_name_error_label.set_markup(m)
+        self.domain_name_error_label.show()
+
+    def domain_user_error(self, msg):
+        self.domain_user_ok.hide()
+        m = '<small><span foreground="darkred"><b>%s</b></span></small>' % msg
+        self.domain_user_error_label.set_markup(m)
+        self.domain_user_error_label.show()
+
     def clear_errors(self):
         self.username_error_label.hide()
         self.hostname_error_label.hide()
         self.password_error_label.hide()
 
+        self.domain_name_error_label.hide()
+
     # Callback functions.
 
     def info_loop(self, widget):
@@ -380,8 +432,7 @@ class PageGtk(PageBase):
         except GLib.GError:
             pass
         else:
-            # FIXME: i18n
-            self.hostname_error('That name already exists on the network.')
+            self.hostname_error(self.hostname_error_text)
             self.hostname_ok.hide()
 
     def hostname_timeout(self, widget):
@@ -407,6 +458,91 @@ class PageGtk(PageBase):
         else:
             self.resolver_ok = False
 
+    def validate_directory_info(self, widget=None):
+        """ Validate domain information """
+        domain_name_is_valid = True
+        domain_info_complete = True
+
+        domain_name_txt = self.domain_name.get_text().strip()
+        domain_user_txt = self.domain_user.get_text()
+        domain_passwd_txt = self.domain_passwd.get_text()
+
+        self.domain_name_ok.hide()
+        if domain_name_txt:
+            errors = check_hostname(domain_name_txt)
+            if errors:
+                self.domain_name_error(make_error_string(self.controller, errors))
+                domain_name_is_valid = False
+            else:
+                self.domain_name_error_label.hide()
+        else:
+            self.domain_name_error_label.hide()
+            domain_name_is_valid = False
+        self.directory_testbutton.set_sensitive(domain_name_is_valid)
+        domain_info_complete = domain_name_is_valid
+
+        if domain_user_txt:
+            # Don't enforce lower case for AD administrator.
+            errors = check_username(domain_user_txt.lower())
+            if errors:
+                self.domain_user_error(make_error_string(self.controller, errors))
+                domain_info_complete = False
+            else:
+                self.domain_user_ok.show()
+                self.domain_user_error_label.hide()
+        else:
+            self.domain_user_ok.hide()
+            self.domain_user_error_label.hide()
+            domain_info_complete = False
+
+        if not domain_passwd_txt:
+            domain_info_complete = False
+
+        self.controller.allow_go_forward(domain_info_complete)
+
+    def switch_userinfo_tab(self, tab):
+        self.userinfo_notebook.set_current_page(tab)
+
+        if tab == 1:
+            self.title = 'ubiquity/text/directory_information_title'
+            self.controller.allow_go_backward(True)
+            self.validate_directory_info()
+        else:
+            self.title = self.plugin_title
+            self.controller.allow_go_backward(False)
+            self.controller.allow_go_forward(True)
+
+        self.controller._wizard.set_page_title(self)
+
+    def plugin_set_online_state(self, state):
+        if not state:
+            self.login_directory.set_active(False)
+        self.login_directory.set_sensitive(state)
+
+    def plugin_on_next_clicked(self):
+        if self.userinfo_notebook.get_current_page() == 0 and self.get_login_directory():
+            self.switch_userinfo_tab(1)
+            return True
+        return False
+
+    def plugin_on_back_clicked(self):
+        if self.userinfo_notebook.get_current_page() == 1:
+            self.switch_userinfo_tab(0)
+            return True
+        return False
+
+    def on_testdomain_click(self, widget):
+        if misc.execute('realm', 'discover', self.domain_name.get_text()):
+            self.domain_name_ok.show()
+            self.domain_name_error_label.hide()
+        else:
+            self.domain_name_ok.hide()
+            self.domain_name_error(self.domain_connection_error_text)
+            self.domain_name_error_label.show()
+
+    def on_login_directory_toggled(self, widget):
+        self.login_directory_extra_label.set_sensitive(widget.get_active())
+
 
 class PageKde(PageBase):
     plugin_breadcrumb = 'ubiquity/text/breadcrumb_user'
@@ -746,6 +882,13 @@ class Page(plugin.Plugin):
             else:
                 self.preseed('netcfg/get_domain', '')
 
+        if hasattr(self.ui, 'get_login_directory'):
+            self.preseed_bool('ubiquity/login_use_directory', self.ui.get_login_directory())
+            if self.ui.get_login_directory():
+                self.preseed('ubiquity/directory_domain', self.ui.get_domain_name())
+                self.preseed('ubiquity/directory_user', self.ui.get_domain_user())
+                self.preseed('ubiquity/directory_passwd', self.ui.get_domain_passwd())
+
         plugin.Plugin.ok_handler(self)
 
     def error(self, priority, question):