diff --git a/src/cloud/ec2/etc/econe.conf b/src/cloud/ec2/etc/econe.conf
index 59001e6c6e..d8329b9f52 100644
--- a/src/cloud/ec2/etc/econe.conf
+++ b/src/cloud/ec2/etc/econe.conf
@@ -25,7 +25,7 @@
 :one_xmlrpc: http://localhost:2633/RPC2
 
 # Host and port where econe server will run
-:server: localhost
+:host: localhost
 :port: 4567
 
 # SSL proxy that serves the API (set if is being used)
diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb
index 24601cefc9..8ac16321ef 100644
--- a/src/cloud/ec2/lib/econe-server.rb
+++ b/src/cloud/ec2/lib/econe-server.rb
@@ -79,7 +79,14 @@ set :config, conf
 include CloudLogger
 enable_logging EC2_LOG, settings.config[:debug_level].to_i
 
-if CloudServer.is_port_open?(settings.config[:server],
+if settings.config[:server]
+    settings.config[:host] ||= settings.config[:server]
+    warning = "Warning: :server: configuration parameter has been deprecated."
+    warning << " Use :host: instead."
+    settings.logger.warn warning
+end
+
+if CloudServer.is_port_open?(settings.config[:host],
                              settings.config[:port])
     settings.logger.error {
         "Port #{settings.config[:port]} busy, please shutdown " <<
@@ -88,7 +95,7 @@ if CloudServer.is_port_open?(settings.config[:server],
     exit -1
 end
 
-set :bind, settings.config[:server]
+set :bind, settings.config[:host]
 set :port, settings.config[:port]
 
 begin
diff --git a/src/cloud/occi/lib/occi-server.rb b/src/cloud/occi/lib/occi-server.rb
index 183ef31c88..9225496094 100644
--- a/src/cloud/occi/lib/occi-server.rb
+++ b/src/cloud/occi/lib/occi-server.rb
@@ -92,7 +92,14 @@ use Rack::Session::Pool, :key => 'occi'
 set :public_folder, Proc.new { File.join(root, "ui/public") }
 set :views, settings.root + '/ui/views'
 
-if CloudServer.is_port_open?(settings.config[:server],
+if settings.config[:server]
+    settings.config[:host] ||= settings.config[:server]
+    warning = "Warning: :server: configuration parameter has been deprecated."
+    warning << " Use :host: instead."
+    settings.logger.warn warning
+end
+
+if CloudServer.is_port_open?(settings.config[:host],
                              settings.config[:port])
     settings.logger.error {
         "Port #{settings.config[:port]} busy, please shutdown " <<
@@ -101,20 +108,10 @@ if CloudServer.is_port_open?(settings.config[:server],
     exit -1
 end
 
-host = settings.config[:host] || settings.config[:server]
-set :bind, host
-
-if settings.config[:server]
-    warning = "Warning: :server: configuration parameter has been deprecated."
-    warning << " Use :host: instead."
-    settings.logger.error warning
-end
-
+set :bind, settings.config[:host]
 set :port, settings.config[:port]
 
 
-
-
 # Create CloudAuth
 begin
     ENV["ONE_CIPHER_AUTH"] = OCCI_AUTH