diff --git a/src/app/pages/dashboard/usersMap/usersMap.component.ts b/src/app/pages/dashboard/usersMap/usersMap.component.ts
index 45e83390..d03d83b7 100644
--- a/src/app/pages/dashboard/usersMap/usersMap.component.ts
+++ b/src/app/pages/dashboard/usersMap/usersMap.component.ts
@@ -1,26 +1,21 @@
 import {Component, ViewEncapsulation} from 'angular2/core';
 
-import './usersMap.loader.ts';
 import {UsersMapService} from './usersMap.service';
+import {BaAmChart} from '../../../theme/components';
 
 @Component({
   selector: 'users-map',
   encapsulation: ViewEncapsulation.None,
   providers: [UsersMapService],
+  directives: [BaAmChart],
   styles: [require('./usersMap.scss')],
   template: require('./usersMap.html')
 })
 export class UsersMap {
 
+  mapData:Object;
+
   constructor(private _usersMapService:UsersMapService) {
-  }
-
-  ngAfterViewInit() {
-    this._loadUsersMap();
-  }
-
-  // TODO: load proper AmCharts theme
-  private _loadUsersMap() {
-    AmCharts.makeChart('amChartMap', this._usersMapService.getData());
+    this.mapData = this._usersMapService.getData();
   }
 }
diff --git a/src/app/pages/dashboard/usersMap/usersMap.html b/src/app/pages/dashboard/usersMap/usersMap.html
index da7ed640..03883d47 100644
--- a/src/app/pages/dashboard/usersMap/usersMap.html
+++ b/src/app/pages/dashboard/usersMap/usersMap.html
@@ -1 +1 @@
-<div id="amChartMap"></div>
+<ba-am-chart baAmChartClass="dashboard-users-map" [baAmChartConfiguration]="mapData"></ba-am-chart>
diff --git a/src/app/pages/dashboard/usersMap/usersMap.loader.ts b/src/app/pages/dashboard/usersMap/usersMap.loader.ts
deleted file mode 100644
index 543f9562..00000000
--- a/src/app/pages/dashboard/usersMap/usersMap.loader.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-require('ammap3');
-require('ammap3/ammap/maps/js/worldLow');
diff --git a/src/app/pages/dashboard/usersMap/usersMap.scss b/src/app/pages/dashboard/usersMap/usersMap.scss
index a8011fe1..2a44ada2 100644
--- a/src/app/pages/dashboard/usersMap/usersMap.scss
+++ b/src/app/pages/dashboard/usersMap/usersMap.scss
@@ -1,4 +1,4 @@
-#amChartMap {
+.dashboard-users-map {
   width: 100%;
   height: 315px;
 }