diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index 45c38b8..c41221c 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -12,8 +12,8 @@ function (angular, _, kbn) {
   module.factory('ZabbixAPIDatasource', function($q, backendSrv, templateSrv) {
 
     function ZabbixAPIDatasource(datasource) {
-      this.name             = datasource.name;
       this.type             = 'zabbix';
+      this.name             = datasource.name;
 
       this.url              = datasource.url;
 
diff --git a/zabbix/partials/config.html b/zabbix/partials/config.html
index 7dbe967..81f0e44 100644
--- a/zabbix/partials/config.html
+++ b/zabbix/partials/config.html
@@ -10,13 +10,13 @@
       User
     </li>
     <li>
-      <input type="text" class="tight-form-input input-large" ng-model='current.zabbixUser' placeholder=""></input>
+      <input type="text" class="tight-form-input input-large" ng-model='current.user' placeholder=""></input>
     </li>
     <li class="tight-form-item">
       Password
     </li>
     <li>
-      <input type="password" class="tight-form-input input-large" ng-model='current.zabbixPassword' placeholder=""></input>
+      <input type="password" class="tight-form-input input-large" ng-model='current.password' placeholder=""></input>
     </li>
   </ul>
   <div class="clearfix"></div>