diff --git a/CASA/jwrapper/jnsscs/jmicasa.c b/CASA/jwrapper/jnsscs/jmicasa.c
index 14b5fa2c..b6d3ad52 100644
--- a/CASA/jwrapper/jnsscs/jmicasa.c
+++ b/CASA/jwrapper/jnsscs/jmicasa.c
@@ -23,7 +23,7 @@
 #include "com_novell_casa_MiCasa.h"
 
 #include <jni.h>
-#include <micasa.h>
+#include <micasa_mgmd.h>
 #include <sscs_utf8.h>
 
 #ifdef __cplusplus
@@ -90,7 +90,7 @@ Java_com_novell_casa_MiCasa_jmiCASASetCredential
 				ssFlags,
 				&appSecretId,		
 				&sharedSecretId, 	
-				jUsernameType,
+				SSCS_CRED_TYPE_BASIC_F,
 				&credential,		
 				NULL
 				);
@@ -99,7 +99,7 @@ Java_com_novell_casa_MiCasa_jmiCASASetCredential
 			ssFlags,
 			&appSecretId,		
 			NULL,
-			jUsernameType,	
+			SSCS_CRED_TYPE_BASIC_F,	
 			&credential,		
 			NULL
 		);
@@ -122,6 +122,7 @@ Java_com_novell_casa_MiCasa_jmiCASAGetCredential
   jobject		jcred)
 {
 	int rcode = 0;	
+	int iCredType = SSCS_CRED_TYPE_BASIC_F;
 	SSCS_SECRET_ID_T		appSecretId = {0};
 	SSCS_SECRET_ID_T		sharedSecretId = {0};
 	SSCS_BASIC_CREDENTIAL	credential = {0};
@@ -153,7 +154,7 @@ Java_com_novell_casa_MiCasa_jmiCASAGetCredential
 				ssFlags,
 				&appSecretId,		
 				&sharedSecretId, 	
-				&unType,					
+				&iCredType,					
 				&credential,		
 				NULL
 				);
@@ -162,7 +163,7 @@ Java_com_novell_casa_MiCasa_jmiCASAGetCredential
 			ssFlags,
 			&appSecretId,		
 			NULL,
-			&unType,
+			&iCredType,
 			&credential,		
 			NULL
 		);