diff --git a/jasper.rest.inc b/jasper.rest.inc
index c981f3f..df7cfb1 100644
--- a/jasper.rest.inc
+++ b/jasper.rest.inc
@@ -8,28 +8,15 @@ define('JRS_REST_URL', 'rest/');
 define('JRS_RESTV2_URL', 'rest_v2/');
 
 /**
- * Return the proper JasperServer Base URL for either REST or JRS HTTP API
- */
-function jasperreports_server_sso_url() {
-  $port = variable_get('jasperreports_server_sso_port', 8080);
-  $context = variable_get(
-    'jasperreports_server_sso_context',
-    'jasperserver-pro'
-  );
-  return $GLOBALS['base_root'] . ':' . $port . '/' . $context;
-}
-
-/**
  * Rest call to keep the JRS session alive.
  */
 function jasperreports_server_sso_rest_keepalive() {
-
+  $jrs_rest_url = $GLOBALS['base_root'] . ':' .  variable_get('jasperreports_server_sso_port', 8080)
+    . '/' . variable_get('jasperreports_server_sso_context', 'jasperserver-pro') . '/' . JRS_REST_URL;
   $curl_opts = array();
   $curl_opts[CURLOPT_COOKIE] = $_SESSION['JRS_Cookie'];
-  $response = jasperreports_server_sso_rest_doRequest(jasperreports_server_sso_url() . '/' . JRS_REST_URL . 'resources?limit=1', $curl_opts);
- 
+  $response = jasperreports_server_sso_rest_doRequest($jrs_rest_url . 'resources?limit=1', $curl_opts);
   return $response['metadata']['http_code'];
-
 }
 
 /**
@@ -37,7 +24,9 @@ function jasperreports_server_sso_rest_keepalive() {
  */
 function jasperreports_server_sso_rest_post($service, $data, $jrs_rest_url = '', $headers = array()) {
   if ($jrs_rest_url == '') {
-    $jrs_rest_url = jasperreports_server_sso_url() . '/' . JRS_REST_URL ;
+    $jrs_rest_url = $GLOBALS['base_root'] . ':'
+      . variable_get('jasperreports_server_sso_port', 8080)
+      . '/' . variable_get('jasperreports_server_sso_context', 'jasperserver-pro') . '/' . JRS_REST_URL;
   }
 
   $request_data = http_build_query($data);
diff --git a/jasperreports_server_sso.module b/jasperreports_server_sso.module
index 5297bf3..9ba1924 100644
--- a/jasperreports_server_sso.module
+++ b/jasperreports_server_sso.module
@@ -312,7 +312,8 @@ function jasperreports_server_sso_block_view($delta = '') {
  * Theme callback for blocks.
  */
 function theme_jasperreports_server_sso_block(&$vars) {
-  $jrs_url = jasperreports_server_sso_url() . '/flow.html?';
+  $jrs_url = $GLOBALS['base_root'] . ':' .  variable_get('jasperreports_server_sso_port', 8080)
+    . '/' . variable_get('jasperreports_server_sso_context', 'jasperserver-pro') . '/flow.html?';
   $jrs_parameters = array();
   $jrs_parameters['theme'] = variable_get('jasperreports_server_sso_library_theme', 'embed');