diff --git a/client/js/controllers/home/machineCreation.js b/client/js/controllers/home/machineCreation.js
index aa488af..1b9fd7b 100644
--- a/client/js/controllers/home/machineCreation.js
+++ b/client/js/controllers/home/machineCreation.js
@@ -3,7 +3,7 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
+mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', 'Image', function ($scope, Compute, $rootScope, $timeout, Identity, Image)
     {
 
         $scope.name = "";
@@ -11,6 +11,9 @@ mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$
         // When we need to show details of machine
         $scope.$on('showMachineCreationEvent', function (eventName, axioms) {
             $scope.axioms = axioms;
+            Image.getImages(function(response){
+                $scope.images = Image.getData().images;
+            });
             $('#machineCreationModal').modal({backdrop: false, keyboard: true});
         });
 
diff --git a/client/partials/home/machineCreation.html b/client/partials/home/machineCreation.html
index 7c23ec7..8abdf86 100644
--- a/client/partials/home/machineCreation.html
+++ b/client/partials/home/machineCreation.html
@@ -25,7 +25,7 @@
                     <fieldset class="form-group">
                         <label class="control-label col-sm-2">Image</label>
                         <select class="col-sm-20" id="ramSelected" ng-model="selectedImage">
-                            <option ng-repeat="image in axioms.images" value="{{image.id}}">{{ image.name}}</option>
+                            <option ng-repeat="image in images" value="{{image.id}}">{{ image.name}}</option>
                         </select>
                     </fieldset>
                 </form>