diff --git a/system/pages/admin/plugins.php b/system/pages/admin/plugins.php
index b18dc3bb..16e64803 100644
--- a/system/pages/admin/plugins.php
+++ b/system/pages/admin/plugins.php
@@ -46,28 +46,33 @@ if(isset($_REQUEST['uninstall'])){
 		error('Plugin ' . $uninstall . ' does not exist.');
 	}
 	else {
-		$string = file_get_contents($filename);
-		$plugin_info = json_decode($string, true);
-		if($plugin_info == false) {
-			warning('Cannot load plugin info ' . $uninstall . '.json');
+		if(!isset($plugin_info['uninstall'])) {
+			error("Plugin doesn't have uninstall options defined. Skipping...");
 		}
 		else {
-			$success = true;
-			foreach($plugin_info['uninstall'] as $file) {
-				$file = BASE . $file;
-				if(!deleteDirectory($file)) {
-					$success = false;
-				}
-			}
-			
-			if($success) {
-				if($cache->enabled()) {
-					$cache->delete('templates');
-				}
-				success('Successfully uninstalled plugin ' . $uninstall);
+			$string = file_get_contents($filename);
+			$plugin_info = json_decode($string, true);
+			if($plugin_info == false) {
+				error('Cannot load plugin info ' . $uninstall . '.json');
 			}
 			else {
-				error('Error while uninstalling plugin ' . $uninstall . ': ' . error_get_last());
+				$success = true;
+				foreach($plugin_info['uninstall'] as $file) {
+					$file = BASE . $file;
+					if(!deleteDirectory($file)) {
+						$success = false;
+					}
+				}
+				
+				if($success) {
+					if($cache->enabled()) {
+						$cache->delete('templates');
+					}
+					success('Successfully uninstalled plugin ' . $uninstall);
+				}
+				else {
+					error('Error while uninstalling plugin ' . $uninstall . ': ' . error_get_last());
+				}
 			}
 		}
 	}
diff --git a/system/templates/admin.plugins.html.twig b/system/templates/admin.plugins.html.twig
index c0130026..dea74d60 100644
--- a/system/templates/admin.plugins.html.twig
+++ b/system/templates/admin.plugins.html.twig
@@ -15,7 +15,11 @@
 		<td>{{ plugin.version }}</td>
 		<td>{{ plugin.author }}</td>
 		<td>{{ plugin.contact }}</td>
-		<td><a href="?p=plugins&uninstall={{ plugin.file }}" onclick="return confirm('Are you sure?');">Uninstall</a></td>
+		<td>
+		{% if plugin.uninstall %}
+			<a href="?p=plugins&uninstall={{ plugin.file }}" onclick="return confirm('Are you sure?');">Uninstall</a>
+		{% endif %}
+		</td>
 	</tr>
 	{% endfor %}
 </table>
\ No newline at end of file