--- a/src/ldt/ldt/user/forms.py	Fri May 24 02:20:46 2013 +0200
+++ b/src/ldt/ldt/user/forms.py	Fri May 24 17:30:29 2013 +0200
@@ -114,9 +114,8 @@
         super(LanguageChangeForm, self).__init__(*args, **kwargs)
         
     def save(self):
-        profile = self.user.get_profile()
-        profile.language = self.cleaned_data['language']
-        profile.save()
+        self.user.language = self.cleaned_data['language']
+        self.user.save()
         return self.user
            
 class PictureForm(forms.Form):

--- a/src/ldt/ldt/user/models.py	Fri May 24 02:20:46 2013 +0200
+++ b/src/ldt/ldt/user/models.py	Fri May 24 17:30:29 2013 +0200
@@ -58,7 +58,6 @@
     objects = LdtUserManager()
 
             
-# To keep consistency with User.get_profile() method
 def get_profile(self):
     return self.profile
 

--- a/src/ldt/ldt/user/views.py	Fri May 24 02:20:46 2013 +0200
+++ b/src/ldt/ldt/user/views.py	Fri May 24 17:30:29 2013 +0200
@@ -12,8 +12,7 @@
 @login_required   
 def profile(request):
     msg = ''
-    profile = request.user.get_profile()
-    user_language = profile.language
+    user_language = request.user.language
     
     if request.method == "POST":
         profile_form = ProfileForm(request.user, request.POST, instance=request.user)
@@ -38,7 +37,7 @@
 @login_required   
 def password(request):
     msg = ''
-    user_language = request.user.get_profile().language
+    user_language = request.user.language
    
     if request.method == "POST":        
         password_form = PasswordChangeForm(request.user, request.POST)
@@ -61,7 +60,7 @@
 @login_required   
 def profile_picture(request):
     msg = ''
-    user_language = request.user.get_profile().language
+    user_language = request.user.language
    
     if request.method == "POST":
         profile_form = ProfileForm(instance=request.user)