diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c96bb6f3..6267ed6b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * File manager would do multiple up-down-up-down loading actions if you escaped renaming a file. Fixed the binding issue. [#122](https://github.com/Pterodactyl/Panel/issues/122)
 * File manager actions would not trigger properly if text in a row was used to right-click from.
 * File manager rename field would not disappear when pressing the escape key in chrome. [#121](https://github.com/Pterodactyl/Panel/issues/121)
+* Fixes bug where server image assigned was not being saved to the database.
 
 ## v0.5.0-pre.1 (Bodacious Boreopterus)
 
diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php
index 394c057a2..da8516ecf 100644
--- a/app/Repositories/ServerRepository.php
+++ b/app/Repositories/ServerRepository.php
@@ -242,6 +242,7 @@ class ServerRepository
                 'option' => $data['option'],
                 'startup' => $data['startup'],
                 'daemonSecret' => $uuid->generate('servers', 'daemonSecret'),
+                'image' => (isset($data['custom_image_name'])) ? $data['custom_image_name'] : $option->docker_image,
                 'username' => $this->generateSFTPUsername($data['name']),
                 'sftp_password' => Crypt::encrypt('not set')
             ]);