diff --git a/src/main/java/com/commafeed/backend/model/UserSettings.java b/src/main/java/com/commafeed/backend/model/UserSettings.java
index 4d4a3d96..d5b3657e 100644
--- a/src/main/java/com/commafeed/backend/model/UserSettings.java
+++ b/src/main/java/com/commafeed/backend/model/UserSettings.java
@@ -43,7 +43,7 @@ public class UserSettings extends AbstractModel {
 	@Column(nullable = false)
 	private ViewMode viewMode;
 
-	@Column(length = 4)
+	@Column(name = "user_lang", length = 4)
 	private String language;
 
 	private boolean showRead;
diff --git a/src/main/resources/changelogs/db.changelog-1.1.xml b/src/main/resources/changelogs/db.changelog-1.1.xml
index fb179220..e44265b4 100644
--- a/src/main/resources/changelogs/db.changelog-1.1.xml
+++ b/src/main/resources/changelogs/db.changelog-1.1.xml
@@ -208,6 +208,9 @@
 			<column name="inserted"></column>
 		</createIndex>
 	</changeSet>	
-			
+		
+	<changeSet author="athou" id="rename-lang">
+		<renameColumn tableName="USERSETTINGS" oldColumnName="language" newColumnName="user_lang" />
+	</changeSet>		
 
 </databaseChangeLog>