diff --git a/modules/away.cpp b/modules/away.cpp
index 4f8982fb..0a38884d 100644
--- a/modules/away.cpp
+++ b/modules/away.cpp
@@ -20,6 +20,9 @@
  *
  * 
  * $Log$
+ * Revision 1.8  2005/04/18 22:32:24  imaginos
+ * move password reset into BootStrap
+ *
  * Revision 1.7  2005/04/18 05:41:43  prozacx
  * Added OnLoad() and print modname in error msg
  *
@@ -98,7 +101,6 @@ public:
 		
 		if ( !BootStrap() )
 		{
-			m_sPassword = "";
 			m_bBootError = true;
 			return( false );
 		}
@@ -128,6 +130,7 @@ public:
 			}
 		} else
 		{
+			m_sPassword = "";
 			CUtils::PrintError("[" + GetModName() + ".so] Failed to Decrypt Messages");
 			return( false );
 		}
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index fb34fe6b..81f52e3d 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -26,6 +26,9 @@
  * better solution then plain text.
  * 
  * $Log$
+ * Revision 1.9  2005/04/18 22:32:24  imaginos
+ * move password reset into BootStrap
+ *
  * Revision 1.8  2005/04/18 17:26:23  imaginos
  * ditch warning message
  *
@@ -121,7 +124,6 @@ public:
 			if ( !BootStrap( vChans[a] ) )
 			{
 				m_bBootError = true;
-				m_sPassword = "";
 				return( false );
 			}
 		}
@@ -143,6 +145,7 @@ public:
 			}
 		} else
 		{
+			m_sPassword = "";
 			CUtils::PrintError("[" + GetModName() + ".so] Failed to Decrypt [" + pChan->GetName() + "]");
 			return( false );
 		}