Index: lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java
===================================================================
diff -u -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 -r601e159780495e1bbfc95dff45cc957ca02321fc
--- lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java	(.../LamsCommunityUtil.java)	(revision daf00a52f630e4b979227c958b7d1e70e0a9b466)
+++ lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java	(.../LamsCommunityUtil.java)	(revision 601e159780495e1bbfc95dff45cc957ca02321fc)
@@ -40,7 +40,7 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
-import sun.misc.BASE64Encoder;
+import org.apache.commons.codec.binary.Base64;
 
 public class LamsCommunityUtil {
 
@@ -100,8 +100,10 @@
 
 	cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
 	byte[] results = cipher.doFinal(text.getBytes("UTF-8"));
-	BASE64Encoder encoder = new BASE64Encoder();
-	return encoder.encode(results);
+	byte[] encodedBytes = Base64.encodeBase64(results);
+	String encodedString = new String(encodedBytes);
+	
+	return encodedString;
     }
 
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java
===================================================================
diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -r601e159780495e1bbfc95dff45cc957ca02321fc
--- lams_common/src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java	(.../Base64StringToImageUtil.java)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
+++ lams_common/src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java	(.../Base64StringToImageUtil.java)	(revision 601e159780495e1bbfc95dff45cc957ca02321fc)
@@ -11,7 +11,7 @@
 
 import org.apache.log4j.Logger;
 
-import sun.misc.BASE64Decoder;
+import org.apache.commons.codec.binary.Base64;
 
 public class Base64StringToImageUtil {
 	private static Logger log = Logger.getLogger(Base64StringToImageUtil.class);
@@ -21,8 +21,7 @@
 			File fileDir = new File(dir);
 			fileDir.mkdirs();
 			
-			BASE64Decoder decoder = new BASE64Decoder();
-			byte[] byteArray = decoder.decodeBuffer(data);
+			byte[] byteArray = Base64.decodeBase64(data.getBytes());
 
 			InputStream in = new ByteArrayInputStream(byteArray);
 			BufferedImage image = javax.imageio.ImageIO.read(in);