diff --git a/src/app/views/account/edit.rhtml b/src/app/views/account/edit.rhtml
index 83a4ca4..7269332 100644
--- a/src/app/views/account/edit.rhtml
+++ b/src/app/views/account/edit.rhtml
@@ -22,7 +22,7 @@
       <p>
         <%= f.label :language, (l :language) %><br />
         
-        <%= collection_select(:user, :language, Language.list, :to_s, :lang_word, {:prompt => true}) %>
+        <%= collection_select(:user, :language, Language.list.map(&:to_s), :to_s, :lang_word, {:prompt => true}) %>
       </p>
       <p>
         <%= f.submit (l :update) %>
diff --git a/src/db/migrate/20080903223558_create_users.rb b/src/db/migrate/20080903223558_create_users.rb
index 7c0ac71..9db701a 100644
--- a/src/db/migrate/20080903223558_create_users.rb
+++ b/src/db/migrate/20080903223558_create_users.rb
@@ -17,7 +17,7 @@ def self.up
       t.column :last_login,                :datetime
       t.column :failed_logins,             :integer, :default => 0
       t.column :user_level,                :integer, :default => User.level_code(:new_member) #new_member
-      t.column :language,                  :string, :default => Language.default
+      t.column :language,                  :string, :default => Language.default.to_s
     end
     add_index :users, :login, :unique => true
   end
diff --git a/src/lib/language.rb b/src/lib/language.rb
index e8fcd43..c9086ff 100644
--- a/src/lib/language.rb
+++ b/src/lib/language.rb
@@ -3,11 +3,11 @@ class Language
   
   # gibt standard-sprache zurück.
   def self.default
-    "en"
+    :en
   end
   
   def self.list
-    ["en", "de"]
+    [:en, :de]
   end
   
 end
\ No newline at end of file