diff --git a/app/Contracts/Repository/DatabaseRepositoryInterface.php b/app/Contracts/Repository/DatabaseRepositoryInterface.php
index d0d982ef8..967ca20fb 100644
--- a/app/Contracts/Repository/DatabaseRepositoryInterface.php
+++ b/app/Contracts/Repository/DatabaseRepositoryInterface.php
@@ -68,7 +68,7 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
      * @param string $username
      * @param string $remote
      * @param string $password
-     * @param string $max_connections
+     * @param $max_connections
      * @return bool
      */
     public function createUser(string $username, string $remote, string $password, string $max_connections): bool;
diff --git a/app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php b/app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php
index ba8b76a83..40a4b06bc 100644
--- a/app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php
+++ b/app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php
@@ -25,6 +25,7 @@ class StoreServerDatabaseRequest extends AdminFormRequest
                     $query->where('database_host_id', $this->input('database_host_id') ?? 0);
                 }),
             ],
+            'max_connections' => 'nullable',
             'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
             'database_host_id' => 'required|integer|exists:database_hosts,id',
         ];
diff --git a/app/Models/Database.php b/app/Models/Database.php
index 6b8b16641..d2a7377f2 100644
--- a/app/Models/Database.php
+++ b/app/Models/Database.php
@@ -51,7 +51,7 @@ class Database extends Model
         'database_host_id' => 'required|exists:database_hosts,id',
         'database' => 'required|string|alpha_dash|between:3,100',
         'username' => 'string|alpha_dash|between:3,100',
-        'max_connections' => 'string',
+        'max_connections' => 'nullable',
         'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
         'password' => 'string',
     ];
diff --git a/app/Repositories/Eloquent/DatabaseRepository.php b/app/Repositories/Eloquent/DatabaseRepository.php
index eb19dd4b0..df9dbb6ee 100644
--- a/app/Repositories/Eloquent/DatabaseRepository.php
+++ b/app/Repositories/Eloquent/DatabaseRepository.php
@@ -135,12 +135,16 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
      * @param string $username
      * @param string $remote
      * @param string $password
-     * @param string $max_connections
+     * @param $max_connections
      * @return bool
      */
-    public function createUser(string $username, string $remote, string $password, string $max_connections): bool
+    public function createUser(string $username, string $remote, string $password, $max_connections): bool
     {
-        return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\' WITH MAX_USER_CONNECTIONS %s', $username, $remote, $password, $max_connections));
+        if (!$max_connections) {
+            return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password));
+        } else {
+            return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\' WITH MAX_USER_CONNECTIONS %s', $username, $remote, $password, $max_connections));
+        }
     }
 
     /**
diff --git a/database/migrations/2020_04_22_055500_add_max_connections_column.php b/database/migrations/2020_04_22_055500_add_max_connections_column.php
index e86622d37..9af4f4684 100644
--- a/database/migrations/2020_04_22_055500_add_max_connections_column.php
+++ b/database/migrations/2020_04_22_055500_add_max_connections_column.php
@@ -14,7 +14,7 @@ class AddMaxConnectionsColumnToDatabasesTable extends Migration
     public function up()
     {
         Schema::table('databases', function (Blueprint $table) {
-            $table->integer('max_connections')->nullable(false)->default(0)->after('password');
+            $table->integer('max_connections')->nullable()->default(0)->after('password');
         });
     }
 
diff --git a/resources/scripts/components/server/databases/DatabaseRow.tsx b/resources/scripts/components/server/databases/DatabaseRow.tsx
index b1d549113..424f4498c 100644
--- a/resources/scripts/components/server/databases/DatabaseRow.tsx
+++ b/resources/scripts/components/server/databases/DatabaseRow.tsx
@@ -51,7 +51,10 @@ export default ({ database, className }: Props) => {
                 addError({ key: 'database:delete', message: httpErrorToHuman(error) });
             });
     };
-
+    if (!database.maxConnections){
+        database.maxConnections = "Unlimited"
+    }
+    
     return (
         <React.Fragment>
             <Formik
diff --git a/resources/views/admin/databases/view.blade.php b/resources/views/admin/databases/view.blade.php
index c13b72a31..66eb170e4 100644
--- a/resources/views/admin/databases/view.blade.php
+++ b/resources/views/admin/databases/view.blade.php
@@ -108,7 +108,11 @@
                             <td class="middle">{{ $database->database }}</td>
                             <td class="middle">{{ $database->username }}</td>
                             <td class="middle">{{ $database->remote }}</td>
-                            <td class="middle">{{ $database->max_connections }}</td>
+                            @if($database->max_connections != null)
+                                <td class="middle">{{ $database->max_connections }}</td>
+                            @else
+                                <td class="middle">Unlimited</td>
+                            @endif
                             <td class="text-center">
                                 <a href="{{ route('admin.servers.view.database', $database->getRelation('server')->id) }}">
                                     <button class="btn btn-xs btn-primary">Manage</button>
diff --git a/resources/views/admin/servers/view/database.blade.php b/resources/views/admin/servers/view/database.blade.php
index 6b3133755..f861008eb 100644
--- a/resources/views/admin/servers/view/database.blade.php
+++ b/resources/views/admin/servers/view/database.blade.php
@@ -46,7 +46,11 @@
                             <td>{{ $database->username }}</td>
                             <td>{{ $database->remote }}</td>
                             <td><code>{{ $database->host->host }}:{{ $database->host->port }}</code></td>
-                            <td>{{ $database->max_connections }}</td>
+                            @if($database->max_connections != null)
+                                <td>{{ $database->max_connections }}</td>
+                            @else
+                                <td>Unlimited</td>
+                            @endif
                             <td class="text-center">
                                 <button data-action="reset-password" data-id="{{ $database->id }}" class="btn btn-xs btn-primary"><i class="fa fa-refresh"></i></button>
                                 <button data-action="remove" data-id="{{ $database->id }}" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></button>
@@ -86,9 +90,9 @@
                         <p class="text-muted small">This should reflect the IP address that connections are allowed from. Uses standard MySQL notation. If unsure leave as <code>%</code>.</p>
                     </div>
                     <div class="form-group">
-                        <label for="pmax_connections" class="control-label">Max Concurrent Connections</label>
-                        <input id="pmax_connections" type="text" name="max_connections" class="form-control" value="150" />
-                        <p class="text-muted small">This should reflect the max number of concurrent connections from this user to the database. Use <code>0</code> for unlimited</p>
+                        <label for="pmax_connections" class="control-label">Concurrent Connections</label>
+                        <input id="pmax_connections" type="text" name="max_connections" class="form-control"/>
+                        <p class="text-muted small">This should reflect the max number of concurrent connections from this user to the database. Leave empty for unlimited.</p>
                     </div>
                 </div>
                 <div class="box-footer">