diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index 75f08bc522..a61858fc65 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -399,6 +399,7 @@ helpers do
         response = ""
         if $conf && $conf[:private_fireedge_endpoint] && !$conf[:private_fireedge_endpoint].empty?
           begin
+            $conf[:private_fireedge_endpoint] = $conf[:private_fireedge_endpoint].downcase
             uri = URI($conf[:private_fireedge_endpoint]+'/fireedge/api/auth')
             user_pass = Base64.decode64(session[:auth])
             username = user_pass.split(":")[0]
diff --git a/src/sunstone/views/guac.erb b/src/sunstone/views/guac.erb
index 6e9529f566..b9fe556d6c 100644
--- a/src/sunstone/views/guac.erb
+++ b/src/sunstone/views/guac.erb
@@ -104,7 +104,7 @@
             'vnc_proxy_port' : '<%= $vnc.proxy_port %>',
             'vnc_client_port' : '<%= $conf[:vnc_client_port] %>',
             'max_upload_file_size' : <%= $conf[:max_upload_file_size] ? $conf[:max_upload_file_size] : "undefined" %>,
-            'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint] %>'
+            'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint].downcase %>'
         },
         'view' : view,
         'available_views' : available_views,
diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb
index 43d3216345..d20ac2c91e 100644
--- a/src/sunstone/views/index.erb
+++ b/src/sunstone/views/index.erb
@@ -64,7 +64,7 @@
           'mapped_ips' : '<%= $conf[:mapped_ips] ? $conf[:mapped_ips] : false %>',
           'get_extended_vm_info': '<%= $conf[:get_extended_vm_info] ? $conf[:get_extended_vm_info] : false %>',
           'get_extended_vm_monitoring': '<%= $conf[:get_extended_vm_monitoring] ? $conf[:get_extended_vm_monitoring] : false %>',
-          'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint] %>',
+          'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint].downcase %>',
         },
         'view' : view,
         'available_views' : available_views,