diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index 743f134eb..8026d77be 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -328,14 +328,14 @@ TomahawkSettings::setLastFmPassword( const QString& password )
 QByteArray
 TomahawkSettings::lastFmSessionKey() const
 {
-    return value( "lastfm/sessionkey" ).toByteArray();
+    return value( "lastfm/session" ).toByteArray();
 }
 
 
 void
 TomahawkSettings::setLastFmSessionKey( const QByteArray& key )
 {
-    setValue( "lastfm/sessionkey", key );
+    setValue( "lastfm/session", key );
 }
 
 
diff --git a/src/scrobbler.cpp b/src/scrobbler.cpp
index 0e5bb1661..7f6576162 100644
--- a/src/scrobbler.cpp
+++ b/src/scrobbler.cpp
@@ -28,8 +28,12 @@ Scrobbler::Scrobbler( QObject* parent )
     , m_reachedScrobblePoint( false )
     , m_authJob( 0 )
 {
-    lastfm::ws::ApiKey = "2aa1089093868876bba20b0482b9cef9";
-    lastfm::ws::SharedSecret = "a7085ef81d7b46fe6ffe11c15b85902f";
+/*
+      Your API Key is 7194b85b6d1f424fe1668173a78c0c4a
+      Your secret is ba80f1df6d27ae63e9cb1d33ccf2052f
+*/
+    lastfm::ws::ApiKey = "7194b85b6d1f424fe1668173a78c0c4a";
+    lastfm::ws::SharedSecret = "ba80f1df6d27ae63e9cb1d33ccf2052f";
     lastfm::ws::Username = TomahawkSettings::instance()->lastFmUsername();
     
     m_pw = TomahawkSettings::instance()->lastFmPassword();
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 16304914f..ec15d1a10 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -201,9 +201,9 @@ SettingsDialog::testLastFmLogin()
 {
 #ifndef NO_LIBLASTFM
     ui->pushButtonTestLastfmLogin->setEnabled( false );
-    ui->pushButtonTestLastfmLogin->setText(  "Testing..." );
+    ui->pushButtonTestLastfmLogin->setText( "Testing..." );
 
-    QString authToken =  md5( ( ui->lineEditLastfmUsername->text() + md5( ui->lineEditLastfmPassword->text().toUtf8() ) ).toUtf8() );
+    QString authToken = md5( ( ui->lineEditLastfmUsername->text() + md5( ui->lineEditLastfmPassword->text().toUtf8() ) ).toUtf8() );
 
     // now authenticate w/ last.fm and get our session key
     QMap<QString, QString> query;