diff --git a/CASA-auth-token/server-java/Svc/Makefile.am b/CASA-auth-token/server-java/Svc/Makefile.am
index 77e816fb..27f7e977 100644
--- a/CASA-auth-token/server-java/Svc/Makefile.am
+++ b/CASA-auth-token/server-java/Svc/Makefile.am
@@ -119,7 +119,7 @@ AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)
 #AXIS_LIBS = $(AXIS_JARS_DIR)/wss4j-1.5.0.jar
 
 LIBS = /usr/share/java/servletapi5.jar:/usr/share/java/xerces-j2.jar
-CLASSPATH = $(AXIS_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util-0.2.270.jar:$(LIBS)
+CLASSPATH = $(AXIS_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util.jar:$(LIBS)
 
 CUR_DIR := $(shell pwd)
 
diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
index e55516ea..71920c20 100644
--- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
+++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
@@ -80,12 +80,12 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
          try
          {
             // Decode the token
-            byte[] tokenBytes = Base64Coder.decode(encodedToken);
-
+            //
             // Unfortunately the password has to be passed to JNDI as a String. Given this,
             // we are going to go ahead and convert the token to a String to facilitate
             // the parsing operation..
-            tokenReader = new BufferedReader(new StringReader(tokenBytes.toString()));
+            String token = new String(Base64Coder.decode(encodedToken));
+            tokenReader = new BufferedReader(new StringReader(token));
 
             // The first line contains the "username"
             m_username = tokenReader.readLine();
diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
index 14a91ebd..029b3e99 100644
--- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
+++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 12 10:23:06 MST 2007 - jluciani@novell.com
+
+- Fix issue that was causing authentication to fail when using
+  Pwd authentication. 
+
 -------------------------------------------------------------------
 Mon Jan  8 15:26:15 MST 2007 - jluciani@novell.com