Bootstrap, Chosen gems. New settings

app/controllers/user_controller.rb

@@ -28,7 +28,7 @@ class UserController < ApplicationController
   end
   
   def update
-    allowed_params = [:name, :email, :lang, :show]
+    allowed_params = [:name, :email, :lang, :show, :lastfm_username, :lastfm_token]
     
     user = User.find_by_vkid(params[:mid])
     unless params[:params].nil?
@@ -87,7 +87,7 @@ private
       lastfm_username: user.lastfm_username,
       lastfm_login_url: ('http://www.last.fm/api/auth?api_key=' << LastFM.api_key <<
         '&cb=http://' << request.host << ':' << request.port.to_s << '/lastfm/connect/?sid=' <<
-        user.session.key if user.lastfm_username.nil?)
+        user.session.key if user.lastfm_username.nil? or user.lastfm_username == "")
     }
   end
 end