2 files changed, 11 insertions, 3 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index 00511e151..44b592036 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -60,7 +60,15 @@ function get_absolute_root_url($with_scheme=true)
   $url = '';
   if ($with_scheme)
   {
-    $url .= 'http://'.$_SERVER['HTTP_HOST'];
+    if (empty($_SERVER['HTTPS']))
+    {
+      $url .= 'http://';
+    }
+    else
+    {
+      $url .= 'https://';
+    }
+    $url .= $_SERVER['HTTP_HOST'];
     if ($_SERVER['SERVER_PORT'] != 80)
     {
       $url_port = ':'.$_SERVER['SERVER_PORT'];
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 53d6da3c1..e78ffb01a 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -866,7 +866,7 @@ function create_user_infos($arg_id, $override_values = null)
   else
   {
     $user_ids = array();
-    if (is_integer($arg_id))
+    if (is_numeric($arg_id))
     {
       $user_ids[] = $arg_id;
     }
@@ -1227,7 +1227,7 @@ function get_email_address_as_display_text($email_address)
   }
   else
   {
-    if (is_adviser())
+    if (script_basename() == 'admin' and is_adviser())
     {
       return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
     }