diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf
index 87e53d4047..b15fb6941d 100644
--- a/src/sunstone/etc/sunstone-server.conf
+++ b/src/sunstone/etc/sunstone-server.conf
@@ -1,12 +1,12 @@
 # OpenNebula sever contact information
-ONE_XMLRPC=http://localhost:2633/RPC2
+:one_xmlrpc: http://localhost:2633/RPC2
 
 # Server Configuration
-HOST=127.0.0.1
-PORT=9869
+:host: 127.0.0.1
+:port: 9869
 
-AUTH=basic
+:auth: basic
 
 # VNC Configuration
-VNC_PROXY_BASE_PORT=29876
-NOVNC_PATH=
+:vnc_proxy_base_port: 29876
+:novnc_path: 
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index c4935e8b61..99ddb7f862 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -46,16 +46,24 @@ require 'rubygems'
 require 'sinatra'
 require 'erb'
 
-require 'Configuration'
+require 'CloudAuth'
 require 'SunstoneServer'
 require 'SunstonePlugins'
 
-set :config, Configuration.new(CONFIGURATION_FILE)
+begin
+    conf = YAML.load_file(CONFIGURATION_FILE)
+rescue Exception => e
+    puts "Error parsing config file #{CONFIGURATION_FILE}: #{e.message}"
+    exit 1
+end
+
+conf[:hash_passwords] = true
 
 ##############################################################################
 # Sinatra Configuration
 ##############################################################################
 use Rack::Session::Pool, :key => 'sunstone'
+set :config, conf
 set :host, settings.config[:host]
 set :port, settings.config[:port]
 
@@ -82,7 +90,7 @@ helpers do
                 # Add a log message
                 return [500, ""]
             end
-            
+
             session[:user]       = user['NAME']
             session[:user_id]    = user['ID']
             session[:user_gid]   = user['GID']