diff --git a/src/libprs500/gui2/dialogs/metadata_single.py b/src/libprs500/gui2/dialogs/metadata_single.py
index c7afcd00bc..9a97c37e2b 100644
--- a/src/libprs500/gui2/dialogs/metadata_single.py
+++ b/src/libprs500/gui2/dialogs/metadata_single.py
@@ -201,7 +201,7 @@ def __init__(self, window, row, db):
         self.series_index.setValue(self.db.series_index(row))
         QObject.connect(self.series, SIGNAL('currentIndexChanged(int)'), self.enable_series_index)
         QObject.connect(self.series, SIGNAL('editTextChanged(QString)'), self.enable_series_index)
-         
+        QObject.connect(self.password_button, SIGNAL('clicked()'), self.change_password) 
 
         self.exec_()
 
@@ -213,11 +213,18 @@ def edit_tags(self):
             tag_string = ', '.join(d.tags)
             self.tags.setText(tag_string)
     
+    def lt_password_dialog(self):
+        return PasswordDialog(self, 'LibraryThing account', 
+                 _('<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you do not have one, you can <a href=\'http://www.librarything.com\'>register</a> for free!.</p>'))
+    
+    def change_password(self):
+        d = self.lt_password_dialog() 
+        d.exec_()
+    
     def fetch_cover(self):
         isbn   = qstring_to_unicode(self.isbn.text())
         if isbn:
-            d = PasswordDialog(self, 'LibraryThing account', 
-                               _('<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you do not have one, you can <a href=\'http://www.librarything.com\'>register</a> for free!.</p>'))
+            d = self.lt_password_dialog() 
             if not d.username() or not d.password():
                 d.exec_()
                 if d.result() != PasswordDialog.Accepted:
diff --git a/src/libprs500/gui2/dialogs/metadata_single.ui b/src/libprs500/gui2/dialogs/metadata_single.ui
index af91a3a8bc..82fe1e6596 100644
--- a/src/libprs500/gui2/dialogs/metadata_single.ui
+++ b/src/libprs500/gui2/dialogs/metadata_single.ui
@@ -389,8 +389,8 @@
          <property name="title" >
           <string>Book Cover</string>
          </property>
-         <layout class="QGridLayout" >
-          <item row="0" column="0" >
+         <layout class="QVBoxLayout" >
+          <item>
            <layout class="QHBoxLayout" >
             <item>
              <spacer>
@@ -439,7 +439,7 @@
             </item>
            </layout>
           </item>
-          <item row="1" column="0" >
+          <item>
            <layout class="QVBoxLayout" >
             <property name="spacing" >
              <number>6</number>
@@ -507,12 +507,26 @@
             </item>
            </layout>
           </item>
-          <item row="2" column="0" >
-           <widget class="QPushButton" name="fetch_cover_button" >
-            <property name="text" >
-             <string>Fetch cover image from server</string>
-            </property>
-           </widget>
+          <item>
+           <layout class="QHBoxLayout" >
+            <item>
+             <widget class="QPushButton" name="fetch_cover_button" >
+              <property name="text" >
+               <string>Fetch cover image from server</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="password_button" >
+              <property name="toolTip" >
+               <string>Change the username and/or password for your account at LibraryThing.com</string>
+              </property>
+              <property name="text" >
+               <string>Change password</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </item>
          </layout>
         </widget>