diff --git a/lib/fog/serverlove/models/compute/server.rb b/lib/fog/serverlove/models/compute/server.rb
index a13f1955b..3ef60969c 100644
--- a/lib/fog/serverlove/models/compute/server.rb
+++ b/lib/fog/serverlove/models/compute/server.rb
@@ -47,12 +47,19 @@ module Fog
         end
         
         def allowed_attributes
-          allowed = [:name, :cpu, :mem, :persistent, :vnc_password]
+          allowed = [
+                      :name, :cpu, :mem, :persistent,
+                      :vnc_password, :vnc,
+                      :ide_0_0, :ide_0_1, :ide_1_0, :ide_1_1,
+                      :boot, :nic_0_model, :nic_0_dhcp
+                    ]
           attributes.select {|k,v| allowed.include? k}
         end
         
         def self.defaults
-          { 'nic:0:model' => 'e1000', 'nic:0:dhcp' => 'auto' }
+          # TODO: Document default settings.
+          # Note that VNC password standards are strict (need explaining)
+          { 'nic:0:model' => 'e1000', 'nic:0:dhcp' => 'auto', 'vnc' => 'auto', 'vnc:password' => 'QXBwKEKQ' }
         end
       end
     end
diff --git a/tests/serverlove/requests/compute/server_tests.rb b/tests/serverlove/requests/compute/server_tests.rb
index 4e2c118e1..8f5deab82 100644
--- a/tests/serverlove/requests/compute/server_tests.rb
+++ b/tests/serverlove/requests/compute/server_tests.rb
@@ -9,6 +9,7 @@ Shindo.tests('Fog::Compute[:serverlove] | server requests', ['serverlove']) do
     'cpu'               => Integer,
     'mem'               => Integer,
     'persistent'        => Fog::Nullable::String,
+    'vnc'               => Fog::Nullable::String,
     'vnc:password'      => Fog::Nullable::String,
     'nic:0:dhcp'        => String,
     'nic:0:model'       => String