diff --git a/internal_packages/onboarding/lib/account-settings-page.cjsx b/internal_packages/onboarding/lib/account-settings-page.cjsx
index 6236a29f4..78a657655 100644
--- a/internal_packages/onboarding/lib/account-settings-page.cjsx
+++ b/internal_packages/onboarding/lib/account-settings-page.cjsx
@@ -201,8 +201,8 @@ class AccountSettingsPage extends React.Component
       data.settings[k] = v
     data.provider = @state.provider.name
 
-    # handle special case for exchange/outlook username field
-    if data.provider in ['exchange','outlook'] and not data.settings.username?.trim().length
+    # handle special case for exchange/outlook/hotmail username field
+    if data.provider in ['exchange','outlook','hotmail'] and not data.settings.username?.trim().length
       data.settings.username = data.email
 
     @setState(tryingToAuthenticate: true)
diff --git a/internal_packages/onboarding/lib/account-types.coffee b/internal_packages/onboarding/lib/account-types.coffee
index 6be0325c1..5b6c0373b 100644
--- a/internal_packages/onboarding/lib/account-types.coffee
+++ b/internal_packages/onboarding/lib/account-types.coffee
@@ -65,6 +65,31 @@ Providers = [
       placeholder: 'Password'
       label: 'Password'
     }]
+  }, {
+    name: 'outlook'
+    displayName: 'Outlook.com'
+    icon: 'ic-settings-account-outlook.png'
+    header_icon: 'setup-icon-provider-outlook.png'
+    color: '#1174c3'
+    fields: [
+      {
+        name: 'name'
+        type: 'text'
+        placeholder: 'Ashton Letterman'
+        label: 'Name'
+      }, {
+        name: 'email'
+        type: 'text'
+        placeholder: 'you@hotmail.com'
+        label: 'Email'
+      }
+    ]
+    settings: [{
+        name: 'password'
+        type: 'password'
+        placeholder: 'Password'
+        label: 'Password'
+      }]
   }, {
     name: 'yahoo'
     displayName: 'Yahoo'
diff --git a/internal_packages/onboarding/stylesheets/onboarding.less b/internal_packages/onboarding/stylesheets/onboarding.less
index 80d692eed..f8557a828 100644
--- a/internal_packages/onboarding/stylesheets/onboarding.less
+++ b/internal_packages/onboarding/stylesheets/onboarding.less
@@ -311,7 +311,7 @@
 
 .page.account-choose {
   width: 388px;
-  height: 615px;
+  height: 688px;
 
   .caption {
     font-size: 17px;
diff --git a/static/images/onboarding/providers/setup-icon-provider-hotmail@2x.png b/static/images/onboarding/providers/setup-icon-provider-outlook@2x.png
similarity index 100%
rename from static/images/onboarding/providers/setup-icon-provider-hotmail@2x.png
rename to static/images/onboarding/providers/setup-icon-provider-outlook@2x.png
diff --git a/static/images/preferences/providers/ic-settings-account-outlook@2x.png b/static/images/preferences/providers/ic-settings-account-outlook@2x.png
new file mode 100644
index 000000000..70b7ec109
Binary files /dev/null and b/static/images/preferences/providers/ic-settings-account-outlook@2x.png differ