diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index 69030b582..bff308dfa 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -3,13 +3,14 @@ namespace Zotlabs\Module;
 
 use App;
 use Zotlabs\Lib\Apps;
+use Zotlabs\Web\Controller;
 
 require_once('include/event.php');
 
 require_once('include/auth.php');
 require_once('include/security.php');
 
-class Cdav extends \Zotlabs\Web\Controller {
+class Cdav extends Controller {
 
 	function init() {
 
diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php
index 359f99b3e..0a79387ce 100644
--- a/Zotlabs/Module/Invite.php
+++ b/Zotlabs/Module/Invite.php
@@ -1,6 +1,10 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Lib\Apps;
+use Zotlabs\Web\Controller;
+
 /**
  * module: invite.php
  *
@@ -9,7 +13,7 @@ namespace Zotlabs\Module;
  */
 
 
-class Invite extends \Zotlabs\Web\Controller {
+class Invite extends Controller {
 
 	function post() {
 	
@@ -57,7 +61,7 @@ class Invite extends \Zotlabs\Web\Controller {
 			else
 				$nmessage = $message;
 	
-			$account = \App::get_account();
+			$account = App::get_account();
 	
 			$res = z_mail(
 				[ 
@@ -95,6 +99,15 @@ class Invite extends \Zotlabs\Web\Controller {
 			return;
 		}
 
+		if(! Apps::system_app_installed(local_channel(), 'Invite')) {
+			//Do not display any associated widgets at this point
+			App::$pdl = '';
+
+			$o = '<b>Invite App (Not Installed):</b><br>';
+			$o .= t('Send email invitations to join this network');
+			return $o;
+		}
+
 		nav_set_selected('Invite');
 	
 		$tpl = get_markup_template('invite.tpl');
@@ -127,11 +140,11 @@ class Invite extends \Zotlabs\Web\Controller {
 				}
 			}
 	
-		$ob = \App::get_observer();
+		$ob = App::get_observer();
 		if(! $ob)
 			return $o;
 	
-		$channel = \App::get_channel();
+		$channel = App::get_channel();
 	
 		$o = replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("send_invite"),