diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php
index 9b239d8b8..07cba84fd 100644
--- a/app/Http/Controllers/Admin/ServersController.php
+++ b/app/Http/Controllers/Admin/ServersController.php
@@ -251,7 +251,7 @@ class ServersController extends Controller
         $repo = new ServerRepository;
         try {
             $repo->updateDetails($id, $request->intersect([
-                'owner_id', 'name', 'reset_token',
+                'owner_id', 'name', 'description', 'reset_token',
             ]));
 
             Alert::success('Server details were successfully updated.')->flash();
diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php
index 1c6f01904..dc7e5515b 100644
--- a/app/Repositories/ServerRepository.php
+++ b/app/Repositories/ServerRepository.php
@@ -89,6 +89,7 @@ class ServerRepository
         $validator = Validator::make($data, [
             'user_id' => 'required|exists:users,id',
             'name' => 'required|regex:/^([\w .-]{1,200})$/',
+            'description' => 'sometimes|nullable|string',
             'memory' => 'required|numeric|min:0',
             'swap' => 'required|numeric|min:-1',
             'io' => 'required|numeric|min:10|max:1000',
@@ -363,6 +364,7 @@ class ServerRepository
         $validator = Validator::make($data, [
             'owner_id' => 'sometimes|required|integer|exists:users,id',
             'name' => 'sometimes|required|regex:([\w .-]{1,200})',
+            'description' => 'sometimes|required|string',
             'reset_token' => 'sometimes|required|accepted',
         ]);
 
@@ -384,24 +386,12 @@ class ServerRepository
                 $resetDaemonKey = true;
             }
 
-            // Update Server Owner if it was passed.
-            if (isset($data['owner_id']) && (int) $data['owner_id'] !== $server->user->id) {
-                $server->owner_id = $data['owner_id'];
-            }
-
-            // Update Server Name if it was passed.
-            if (isset($data['name'])) {
-                $server->name = $data['name'];
-            }
-
             // Save our changes
-            $server->save();
+            $server->fill($data)->save();
 
             // Do we need to update? If not, return successful.
             if (! $resetDaemonKey) {
-                DB::commit();
-
-                return true;
+                return DB::commit();
             }
 
             $res = $server->node->guzzleClient([
@@ -418,16 +408,13 @@ class ServerRepository
             ]);
 
             if ($res->getStatusCode() === 204) {
-                DB::commit();
-
-                return true;
+                return DB::commit();
             } else {
                 throw new DisplayException('Daemon returned a a non HTTP/204 error code. HTTP/' + $res->getStatusCode());
             }
         } catch (\Exception $ex) {
             DB::rollBack();
-            Log::error($ex);
-            throw new DisplayException('An error occured while attempting to update this server\'s information.');
+            throw $ex;
         }
     }
 
diff --git a/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php b/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php
new file mode 100644
index 000000000..1e5ce0273
--- /dev/null
+++ b/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddServerDescriptionColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->text('description')->after('name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('description');
+        });
+    }
+}
diff --git a/public/themes/pterodactyl/css/pterodactyl.css b/public/themes/pterodactyl/css/pterodactyl.css
index aca92d909..e0c34798f 100644
--- a/public/themes/pterodactyl/css/pterodactyl.css
+++ b/public/themes/pterodactyl/css/pterodactyl.css
@@ -280,3 +280,12 @@ span[aria-labelledby="select2-pUserId-container"] {
 .strong {
     font-weight: bold !important;
 }
+
+.server-description > td {
+    padding-top: 0 !important;
+    border-top: 0 !important;
+}
+
+tr:hover + tr.server-description {
+    background-color: #f5f5f5 !important;
+}
diff --git a/resources/themes/pterodactyl/admin/servers/new.blade.php b/resources/themes/pterodactyl/admin/servers/new.blade.php
index 483831644..733798211 100644
--- a/resources/themes/pterodactyl/admin/servers/new.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/new.blade.php
@@ -41,14 +41,21 @@
                     <h3 class="box-title">Core Details</h3>
                 </div>
                 <div class="box-body row">
-                    <div class="form-group col-sm-6">
-                        <label for="pName">Server Name</label>
-                        <input type="text" class="form-control" id="pName" name="name" value="{{ old('name') }}" placeholder="Server Name">
-                        <p class="small text-muted no-margin">Character limits: <code>a-z A-Z 0-9 _ - .</code> and <code>[Space]</code> (max 200 characters).</p>
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="pName">Server Name</label>
+                            <input type="text" class="form-control" id="pName" name="name" value="{{ old('name') }}" placeholder="Server Name">
+                            <p class="small text-muted no-margin">Character limits: <code>a-z A-Z 0-9 _ - .</code> and <code>[Space]</code> (max 200 characters).</p>
+                        </div>
+                        <div class="form-group">
+                            <label for="pUserId">Server Owner</label>
+                            <select class="form-control" style="padding-left:0;" name="user_id" id="pUserId"></select>
+                        </div>
                     </div>
-                    <div class="form-group col-sm-6">
-                        <label for="pUserId">Server Owner</label>
-                        <select class="form-control" style="padding-left:0;" name="user_id" id="pUserId"></select>
+                    <div class="form-group col-md-6">
+                        <label for="description" class="control-label">Server Description</label>
+                        <textarea name="description" rows="3" class="form-control">{{ old('description') }}</textarea>
+                        <p class="text-muted small">A brief description of this server.</p>
                     </div>
                 </div>
             </div>
diff --git a/resources/themes/pterodactyl/admin/servers/view/details.blade.php b/resources/themes/pterodactyl/admin/servers/view/details.blade.php
index e2956d56c..145f540bc 100644
--- a/resources/themes/pterodactyl/admin/servers/view/details.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/view/details.blade.php
@@ -71,6 +71,11 @@
                         </select>
                         <p class="text-muted small">You can change the owner of this server by changing this field to an email matching another use on this system. If you do this a new daemon security token will be generated automatically.</p>
                     </div>
+                    <div class="form-group">
+                        <label for="description" class="control-label">Server Description</label>
+                        <textarea name="description" rows="3" class="form-control">{{ old('description', $server->description) }}</textarea>
+                        <p class="text-muted small">A brief description of this server.</p>
+                    </div>
                     <div class="form-group">
                         <label for="name" class="control-label">Daemon Secret Token</label>
                         <input type="text" disabled value="{{ $server->daemonSecret }}" class="form-control" />
diff --git a/resources/themes/pterodactyl/base/index.blade.php b/resources/themes/pterodactyl/base/index.blade.php
index b7d51e6ce..b127926ff 100644
--- a/resources/themes/pterodactyl/base/index.blade.php
+++ b/resources/themes/pterodactyl/base/index.blade.php
@@ -60,30 +60,35 @@
                             <th class="text-center">@lang('strings.status')</th>
                         </tr>
                         @foreach($servers as $server)
-                        <tr class="dynamic-update" data-server="{{ $server->uuidShort }}">
-                            <td><code>{{ $server->uuidShort }}</code></td>
-                            <td><a href="{{ route('server.index', $server->uuidShort) }}">{{ $server->name }}</a></td>
-                            <td>{{ $server->node->name }}</td>
-                            <td><code>{{ $server->allocation->alias }}:{{ $server->allocation->port }}</code></td>
-                            <td class="text-center hidden-sm hidden-xs"><span data-action="memory">--</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td>
-                            <td class="text-center hidden-sm hidden-xs"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">--</span> %</td>
-                            <td class="text-center">
-                                @if($server->user->id === Auth::user()->id)
-                                    <span class="label bg-purple">@lang('strings.owner')</span>
-                                @elseif(Auth::user()->isRootAdmin())
-                                    <span class="label bg-maroon">@lang('strings.admin')</span>
-                                @else
-                                    <span class="label bg-blue">@lang('strings.subuser')</span>
-                                @endif
-                            </td>
-                            <td class="text-center" data-action="status">
-                                @if($server->suspended === 1)
-                                    <span class="label label-warning">@lang('strings.suspended')</span>
-                                @else
-                                    <span class="label label-default"><i class="fa fa-refresh fa-fw fa-spin"></i></span>
-                                @endif
-                            </td>
-                        </tr>
+                            <tr class="dynamic-update" data-server="{{ $server->uuidShort }}">
+                                <td @if(! empty($server->description)) rowspan="2" @endif><code>{{ $server->uuidShort }}</code></td>
+                                <td><a href="{{ route('server.index', $server->uuidShort) }}">{{ $server->name }}</a></td>
+                                <td>{{ $server->node->name }}</td>
+                                <td><code>{{ $server->allocation->alias }}:{{ $server->allocation->port }}</code></td>
+                                <td class="text-center hidden-sm hidden-xs"><span data-action="memory">--</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td>
+                                <td class="text-center hidden-sm hidden-xs"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">--</span> %</td>
+                                <td class="text-center">
+                                    @if($server->user->id === Auth::user()->id)
+                                        <span class="label bg-purple">@lang('strings.owner')</span>
+                                    @elseif(Auth::user()->isRootAdmin())
+                                        <span class="label bg-maroon">@lang('strings.admin')</span>
+                                    @else
+                                        <span class="label bg-blue">@lang('strings.subuser')</span>
+                                    @endif
+                                </td>
+                                <td class="text-center" data-action="status">
+                                    @if($server->suspended === 1)
+                                        <span class="label label-warning">@lang('strings.suspended')</span>
+                                    @else
+                                        <span class="label label-default"><i class="fa fa-refresh fa-fw fa-spin"></i></span>
+                                    @endif
+                                </td>
+                            </tr>
+                            @if (! empty($server->description))
+                                <tr class="server-description">
+                                    <td colspan="7"><p class="text-muted small no-margin">{{ str_limit($server->description, 400) }}</p></td>
+                                </tr>
+                            @endif
                         @endforeach
                     </tbody>
                 </table>
@@ -100,5 +105,12 @@
 
 @section('footer-scripts')
     @parent
+    <script>
+        $('tr.server-description').on('mouseenter mouseleave', function (event) {
+            $(this).prev('tr').css({
+                'background-color': (event.type === 'mouseenter') ? '#f5f5f5' : '',
+            });
+        });
+    </script>
     {!! Theme::js('js/frontend/serverlist.js') !!}
 @endsection