diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 743db9d0..2f1f5619 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -307,12 +307,12 @@ m<%inherit file="base.html"/>
                         </div>
                         <div class="config">
                             <div class="row">
-                                <label>What.cd UID Number: </label>
-                                <input type="text" name="whatcd_uid" value="${config['whatcd_uid']}" size="36">
+                                <label>What.cd Username: </label>
+                                <input type="text" name="whatcd_username" value="${config['whatcd_username']}" size="36">
                             </div>
                             <div class="row">
                                 <label>What.cd Passkey: </label>
-                                <input type="text" name="whatcd_passkey" value="${config['whatcd_passkey']}" size="36">
+                                <input type="password" name="whatcd_password" value="${config['whatcd_password']}" size="36">
                             </div>
                         </div>
                     </fieldset>
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 6e225166..c1e880b6 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -464,8 +464,8 @@ class WebInterface(object):
                     "waffles_uid" : headphones.WAFFLES_UID,
                     "waffles_passkey": headphones.WAFFLES_PASSKEY,
                     "use_whatcd" : checked(headphones.WHATCD),
-                    "whatcd_uid" : headphones.WHATCD_UID,
-                    "whatcd_passkey": headphones.WHATCD_PASSKEY,
+                    "whatcd_username" : headphones.WHATCD_USERNAME,
+                    "whatcd_password": headphones.WHATCD_PASSWORD,
                     "pref_qual_0" : radio(headphones.PREFERRED_QUALITY, 0),
                     "pref_qual_1" : radio(headphones.PREFERRED_QUALITY, 1),
                     "pref_qual_3" : radio(headphones.PREFERRED_QUALITY, 3),
@@ -548,7 +548,7 @@ class WebInterface(object):
         sab_category=None, download_dir=None, blackhole=0, blackhole_dir=None, usenet_retention=None, nzbmatrix=0, nzbmatrix_username=None, nzbmatrix_apikey=None, 
         newznab=0, newznab_host=None, newznab_apikey=None, newznab_enabled=0, nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, newzbin=0, newzbin_uid=None, 
         newzbin_password=None, preferred_quality=0, preferred_bitrate=None, detect_bitrate=0, move_files=0, torrentblackhole_dir=None, download_torrent_dir=None, 
-        numberofseeders=10, use_isohunt=0, use_kat=0, use_mininova=0, waffles=0, waffles_uid=None, waffles_passkey=None, whatcd=0, whatcd_uid=None, whatcd_passkey=None,
+        numberofseeders=10, use_isohunt=0, use_kat=0, use_mininova=0, waffles=0, waffles_uid=None, waffles_passkey=None, whatcd=0, whatcd_username=None, whatcd_password=None,
         rename_files=0, correct_metadata=0, cleanup_files=0, add_album_art=0, embed_album_art=0, embed_lyrics=0, destination_dir=None, lossless_destination_dir=None,
         folder_format=None, file_format=None, include_extras=0, single=0, ep=0, compilation=0, soundtrack=0, live=0, remix=0, spokenword=0, audiobook=0,
         autowant_upcoming=False, autowant_all=False, interface=None, log_dir=None, music_encoder=0, encoder=None, bitrate=None, samplingfrequency=None,
@@ -599,8 +599,8 @@ class WebInterface(object):
         headphones.WAFFLES_UID = waffles_uid
         headphones.WAFFLES_PASSKEY = waffles_passkey
         headphones.WHATCD = whatcd
-        headphones.WHATCD_UID = whatcd_uid
-        headphones.WHATCD_PASSKEY = whatcd_passkey
+        headphones.WHATCD_USERNAME = whatcd_username
+        headphones.WHATCD_PASSWORD = whatcd_password
         headphones.PREFERRED_QUALITY = int(preferred_quality)
         headphones.PREFERRED_BITRATE = preferred_bitrate
         headphones.PREFERRED_BITRATE_HIGH_BUFFER = preferred_bitrate_high_buffer