diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api.js.es6
index 832bf1c4..2457a917 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api.js.es6
@@ -59,7 +59,7 @@ export default Ember.Controller.extend({
           });
         }
       } else {
-        // basic auth
+        // basic auth - no need to authorize separately
       }
 
       window.location.href = authUrl + query;
@@ -104,6 +104,7 @@ export default Ember.Controller.extend({
       }
 
       const endpoints = api.endpoints;
+      
       if (endpoints.length) {
         data['endpoints'] = JSON.stringify(endpoints);
       }
diff --git a/assets/javascripts/discourse/models/custom-wizard-api.js.es6 b/assets/javascripts/discourse/models/custom-wizard-api.js.es6
index 5f051cc9..726cebe0 100644
--- a/assets/javascripts/discourse/models/custom-wizard-api.js.es6
+++ b/assets/javascripts/discourse/models/custom-wizard-api.js.es6
@@ -24,6 +24,8 @@ CustomWizardApi.reopenClass({
       tokenUrl: authorization.token_url,
       clientId: authorization.client_id,
       clientSecret: authorization.client_secret,
+      username: authorization.username,
+      password: authorization.password,
       authParams: Ember.A(authorization.auth_params),
       authorized: authorization.authorized,
       accessToken: authorization.access_token,
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api.hbs b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
index a17a0c0b..9d929985 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-api.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
@@ -45,15 +45,17 @@
       {{i18n 'admin.wizard.api.auth.settings'}}
     </div>
 
-    {{#if api.name}}
-      <div class="control-group redirect-uri">
-        <div class="control-label">
-          <label>{{i18n 'admin.wizard.api.auth.redirect_uri'}}</label>
-          <div class="controls">
-            {{api.redirectUri}}
+    {{#if isOauth}}
+      {{#if api.name}}
+        <div class="control-group redirect-uri">
+          <div class="control-label">
+            <label>{{i18n 'admin.wizard.api.auth.redirect_uri'}}</label>
+            <div class="controls">
+              {{api.redirectUri}}
+            </div>
           </div>
         </div>
-      </div>
+      {{/if}}
     {{/if}}
 
     <div class="control-group auth-type">
@@ -63,21 +65,21 @@
       </div>
     </div>
 
-    <div class="control-group">
-      <label>{{i18n 'admin.wizard.api.auth.url'}}</label>
-      <div class="controls">
-        {{input value=api.authUrl}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label>{{i18n 'admin.wizard.api.auth.token_url'}}</label>
-      <div class="controls">
-        {{input value=api.tokenUrl}}
-      </div>
-    </div>
-
     {{#if isOauth}}
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.auth.url'}}</label>
+        <div class="controls">
+          {{input value=api.authUrl}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.auth.token_url'}}</label>
+        <div class="controls">
+          {{input value=api.tokenUrl}}
+        </div>
+      </div>
+
       <div class="control-group">
         <label>{{i18n 'admin.wizard.api.auth.client_id'}}</label>
         <div class="controls">
@@ -105,59 +107,75 @@
           {{d-button label='admin.wizard.api.auth.params.new' icon='plus' action='addParam'}}
         </div>
       </div>
+    {{else}}
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.auth.username'}}</label>
+        <div class="controls">
+          {{input value=api.username}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.auth.password'}}</label>
+        <div class="controls">
+          {{input value=api.password}}
+        </div>
+      </div>
     {{/if}}
   </div>
 
-  <div class="status">
-    <div class="authorization">
-      {{#if api.authorized}}
-        <span class="authorization-indicator authorized"></span>
-        <span>{{i18n "admin.wizard.api.status.authorized"}}</span>
-      {{else}}
-        <span class="authorization-indicator not-authorized"></span>
-        <span>{{i18n "admin.wizard.api.status.not_authorized"}}</span>
-      {{/if}}
-    </div>
+  {{#if isOauth}}
+    <div class="status">
+      <div class="authorization">
+        {{#if api.authorized}}
+          <span class="authorization-indicator authorized"></span>
+          <span>{{i18n "admin.wizard.api.status.authorized"}}</span>
+        {{else}}
+          <span class="authorization-indicator not-authorized"></span>
+          <span>{{i18n "admin.wizard.api.status.not_authorized"}}</span>
+        {{/if}}
+      </div>
 
-    <div class="wizard-header medium">
-      {{i18n 'admin.wizard.api.status.label'}}
-    </div>
+      <div class="wizard-header medium">
+        {{i18n 'admin.wizard.api.status.label'}}
+      </div>
 
-    <div class="control-group">
-      <label>{{i18n 'admin.wizard.api.status.code'}}</label>
-      <div class="controls">
-        {{api.code}}
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.status.code'}}</label>
+        <div class="controls">
+          {{api.code}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.status.access_token'}}</label>
+        <div class="controls">
+          {{api.accessToken}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.status.refresh_token'}}</label>
+        <div class="controls">
+          {{api.refreshToken}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.status.expires_at'}}</label>
+        <div class="controls">
+          {{api.tokenExpiresAt}}
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label>{{i18n 'admin.wizard.api.status.refresh_at'}}</label>
+        <div class="controls">
+          {{api.tokenRefreshAt}}
+        </div>
       </div>
     </div>
-
-    <div class="control-group">
-      <label>{{i18n 'admin.wizard.api.status.access_token'}}</label>
-      <div class="controls">
-        {{api.accessToken}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label>{{i18n 'admin.wizard.api.status.refresh_token'}}</label>
-      <div class="controls">
-        {{api.refreshToken}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label>{{i18n 'admin.wizard.api.status.expires_at'}}</label>
-      <div class="controls">
-        {{api.tokenExpiresAt}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label>{{i18n 'admin.wizard.api.status.refresh_at'}}</label>
-      <div class="controls">
-        {{api.tokenRefreshAt}}
-      </div>
-    </div>
-  </div>
+  {{/if}}
 </div>
 
 <div class="wizard-header">
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c14795d7..4bdbd5f9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -149,6 +149,8 @@ en:
             token_url: "Token url"
             client_id: 'Client id'
             client_secret: 'Client secret'
+            username: 'username'
+            password: 'password'
             params:
               label: 'Params'
               new: 'New param'