diff --git a/app/Console/Commands/Modules/InstallModule.php b/app/Console/Commands/Modules/InstallModule.php
index 3f2836c3..61477a71 100644
--- a/app/Console/Commands/Modules/InstallModule.php
+++ b/app/Console/Commands/Modules/InstallModule.php
@@ -67,6 +67,8 @@ class InstallModule extends Command
         Cache::forget('enabled-modules');
         Cache::forget('module-handler-to-id-enumeration');
 
+        exec('php artisan module:enable '.$name);
+        exec('php artisan cache:clear');
         exec('composer dump-autoload');
 
         // inform user
diff --git a/app/Console/Commands/SetTemplate.php b/app/Console/Commands/SetTemplate.php
index a196257c..3fcacca5 100644
--- a/app/Console/Commands/SetTemplate.php
+++ b/app/Console/Commands/SetTemplate.php
@@ -74,7 +74,7 @@ class SetTemplate extends Command
         // run again artisan for publishing resources
         // it cannot be done using $this->call, because we need to load different template into service providers
         if ($publish) {
-            exec('php artisan vendor:publish');
+            exec('php artisan template:publish');
         }
     }
 }
diff --git a/resources/views/admin/content/_partials/overviewRow.blade.php b/resources/views/admin/content/_partials/overviewRow.blade.php
index 12ed6919..1c955437 100644
--- a/resources/views/admin/content/_partials/overviewRow.blade.php
+++ b/resources/views/admin/content/_partials/overviewRow.blade.php
@@ -45,7 +45,9 @@
             @lang($page->module->name)
         </a>
         <br>
-        <small>({{$page->templateModel->name}})</small>
+        @if(!is_null($page->templateModel))
+            <small>({{$page->templateModel->name}})</small>
+        @endif
     </div>
     <div class="col-lg-2 hidden-md-down">@date($page->created_at)</div>
     <div class="col-xs-2 col-lg-1 text-center">