diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php
index 05adf3e030..ca12d47026 100644
--- a/phpgwapi/templates/idots/navbar.inc.php
+++ b/phpgwapi/templates/idots/navbar.inc.php
@@ -235,8 +235,19 @@ href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'"><img src="'.$GLOBAL
 				$var['messages'] = $api_messages . '<br>' . checkcode($cd);
 			}
 
-			$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+			if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
+			{
+				$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
+			}
+			else
+			{
+				$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+			}
 			$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+			if (substr($var['logo_url'],0,4) != 'http')
+			{
+				$var['logo_url'] = 'http://'.$var['logo_url'];
+			}
 			$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
 
 			$GLOBALS['idots_tpl']->set_var($var);
diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index 2d7d7f0633..c7e9221bdc 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -156,8 +156,19 @@
 			$var['powered_by'] = '';
 		}
 
-		$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+		if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
+		{
+			$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
+		}
+		else
+		{
+			$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+		}
 		$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+		if (substr($var['logo_url'],0,4) != 'http')
+		{
+			$var['logo_url'] = 'http://'.$var['logo_url'];
+		}
 		$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
 
 		$tpl->set_var($var);
diff --git a/phpgwapi/templates/jerryr/navbar.inc.php b/phpgwapi/templates/jerryr/navbar.inc.php
index e4853935f5..24fb7f7544 100644
--- a/phpgwapi/templates/jerryr/navbar.inc.php
+++ b/phpgwapi/templates/jerryr/navbar.inc.php
@@ -204,8 +204,19 @@
 				$var['messages'] = $api_messages . '<br>' . checkcode($cd);
 			}
 
-			$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+			if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
+			{
+				$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
+			}
+			else
+			{
+				$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+			}
 			$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+			if (substr($var['logo_url'],0,4) != 'http')
+			{
+				$var['logo_url'] = 'http://'.$var['logo_url'];
+			}
 			$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
 
 			$GLOBALS['jerryr_tpl']->set_var($var);
diff --git a/phpgwapi/templates/literati/navbar.inc.php b/phpgwapi/templates/literati/navbar.inc.php
index 4bec020f7b..9ec6a00e4d 100644
--- a/phpgwapi/templates/literati/navbar.inc.php
+++ b/phpgwapi/templates/literati/navbar.inc.php
@@ -105,8 +105,19 @@
 			$var['messages'] = $api_messages . '<br>' . checkcode($cd);
 		}
 
-		$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+		if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
+		{
+			$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
+		}
+		else
+		{
+			$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+		}
 		$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+		if (substr($var['logo_url'],0,4) != 'http')
+		{
+			$var['logo_url'] = 'http://'.$var['logo_url'];
+		}
 		$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
 
 		$GLOBALS['idots_tpl']->set_var($var);