diff --git a/login.html b/login.html
index 1eb146e..f0e27aa 100644
--- a/login.html
+++ b/login.html
@@ -50,24 +50,32 @@
 	<div id='logpasswordtable'>
 	  
 	  {% if is_login %}
-	  
-	  <h3>Login and Password</h3>
-	  <div id='logpassword'>
-	    {{ site }} requires a Login/Password for this story.
-	    You need to provide your Login/Password for {{ site }}
-	    to download it.
-	  </div>
-	  <div class='fieldandlabel'>
-	    <div class='label'>Login</div>
-	    <div class='field'><input type='text' name='login' size='50'></div>
-	  </div>
-	  
-	  <div class='fieldandlabel'>
-	    <div class='label'>Password</div>
-	    <div class='field'><input type='password' name='password' size='50'></div>
-	  </div>
-	  
-	  {% else %}
+
+              {% if is_passwdonly %}
+                   <h3>Password</h3>
+                   <div id='logpassword'>
+                     {{ site }} requires a Password for this story.<br>
+                     You need to provide the Password for this story
+                     to download it.
+                   </div>
+              {% else %}
+                   <h3>Login / Password</h3>
+                   <div id='logpassword'>
+                     {{ site }} requires a Login/Password for this story.<br>
+                     You need to provide your Login/Password for {{ site }}
+                     to download it.
+                   </div>
+                   <div class='fieldandlabel'>
+                     <div class='label'>Login</div>
+                     <div class='field'><input type='text' name='login' size='50'></div>
+                   </div>
+              {% endif %}
+          <div class='fieldandlabel'>
+             <div class='label'>Password</div>
+             <div class='field'><input type='password' name='password' size='50'></div>
+          </div>
+         	  
+     	  {% else %}
 
 	  <input type="hidden" name="login" value='{{ login }}'>
 	  <input type="hidden" name="password" value='{{ password }}'>
diff --git a/main.py b/main.py
index 2a789b4..ee18b6d 100644
--- a/main.py
+++ b/main.py
@@ -387,7 +387,7 @@ class FanfictionDownloader(UserConfigServer):
             adapter = adapters.getAdapter(configuration,url)
             logging.info('Created an adaper: %s' % adapter)
 
-            if len(login) > 1:
+            if login or password:
                 adapter.username=login
                 adapter.password=password
             adapter.is_adult=is_adult
@@ -427,12 +427,14 @@ class FanfictionDownloader(UserConfigServer):
             download.put()
             logging.info(unicode(e))
             is_login= ( isinstance(e, exceptions.FailedToLogin) )
+            is_passwdonly = is_login and e.passwdonly
             template_values = dict(nickname = user.nickname(),
                                    url = url,
                                    format = format,
                                    site = adapter.getConfigSection(),
                                    fic = download,
                                    is_login=is_login,
+                                   is_passwdonly=is_passwdonly
                                    )
             # thewriterscoffeeshop.com can do adult check *and* user required.
             if isinstance(e,exceptions.AdultCheckRequired):
@@ -491,7 +493,7 @@ class FanfictionDownloaderTask(UserConfigServer):
 
             logging.info('Created an adapter: %s' % adapter)
 
-            if len(login) > 1:
+            if login or password:
                 adapter.username=login
                 adapter.password=password
             adapter.is_adult=is_adult