diff --git a/src/sunstone/routes/oneflow.rb b/src/sunstone/routes/oneflow.rb
index b6ac95965c..5a100e1c3b 100644
--- a/src/sunstone/routes/oneflow.rb
+++ b/src/sunstone/routes/oneflow.rb
@@ -25,7 +25,7 @@ helpers do
         split_array = flow_client.one_auth.split(':')
 
         Service::Client.new(
-                :url        => session[:zone_flow_url] || $conf[:oneflow_server],
+                :url        => session[:zone_flow_url],
                 :user_agent => "Sunstone",
                 :username   => split_array.shift,
                 :password   => split_array.join(':'))
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index c651641215..d5d31a1579 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -577,7 +577,8 @@ helpers do
     def parse_flow_url(endpoint)
       if endpoint
         uri = URI(endpoint.to_s)
-        return "#{uri.scheme}://#{uri.host}:2474"
+        flow_uri = URI($conf[:oneflow_server])
+        return "#{uri.scheme}://#{uri.host}:#{flow_uri.port}"
       end
     end
 end