diff --git a/CASA/micasad/startup/casacfgpam b/CASA/micasad/startup/casacfgpam
index 53571938..0e4ce2ff 100755
--- a/CASA/micasad/startup/casacfgpam
+++ b/CASA/micasad/startup/casacfgpam
@@ -1,57 +1,65 @@
 #!/bin/bash
-# Adding CASA pam entries to pam files.
-rm -f *.rpmsave
+# Adding CASA pam entries to pam files only on the desktop.
+DESKTOP=`grep -i desktop SuSE-release`
 
-prefix="/etc/pam.d"
-for auth_file in "$prefix/login" "$prefix/sshd" "$prefix/xdm" "$prefix/gdm" "$prefix/kdm"
-do
-	if [ -f $auth_file ]
-	then
-		sed -i '/pam_micasa/d' $auth_file
+if [ "$DESKTOP" != "" ]
+then
+       
+    rm -f *.rpmsave
+    
+    prefix="/etc/pam.d"
+    for auth_file in "$prefix/login" "$prefix/sshd" "$prefix/xdm" "$prefix/gdm" "$prefix/kdm"
+    do
+	    if [ -f $auth_file ]
+	    then
+		    sed -i '/pam_micasa/d' $auth_file
+    
+		    auth_entry=`echo -e "auth\t required\tpam_micasa.so"`
+    
+		    var1=`grep ^auth.*required.*pam_unix2.so $auth_file`
+		    if [ "$var1" != "" ]
+		    then
+		      sed -i "/^auth.*required.*pam_unix2.so/a$auth_entry" $auth_file
+		      continue
+		    fi
+    
+		    var2=`grep ^auth.*include.*common-auth $auth_file`
+		    if [ "$var2" != "" ]
+		    then
+		      sed -i "/^auth.*include.*common-auth/a$auth_entry" $auth_file
+		      continue
+		    fi
+    
+		    sed -i "0,/^auth/s/^\(auth.*\)/\1\n$auth_entry/" $auth_file 
+	    fi
+    done
+    
+    
+    for password_file in "$prefix/passwd" "$prefix/gnome-passwd"
+    do
+	    if [ -f $password_file ]
+	    then
+		    sed -i '/pam_micasa/d' $password_file
+    
+		    passwd_entry=`echo -e "password required\tpam_micasa.so"`
+    
+		    var1=`grep ^password.*required.*pam_unix2.so $password_file`
+		    if [ "$var1" != "" ]
+		    then
+		      sed -i "/^password.*required.*pam_unix2.so/a$passwd_entry" $password_file
+		      continue
+		    fi
+    
+		    var2=`grep ^password.*include.*common-password $password_file`
+		    if [ "$var2" != "" ]
+		    then
+		      sed -i "/^password.*include.*common-password/a$passwd_entry" $password_file
+		      continue
+		    fi
+    
+		    sed -i "0,/^password/s/^\(password.*\)/\1\n$passwd_entry/" $password_file 
+	    fi
+    done
 
-		auth_entry=`echo -e "auth\t required\tpam_micasa.so"`
+fi
 
-		var1=`grep ^auth.*required.*pam_unix2.so $auth_file`
-		if [ "$var1" != "" ]
-		then
-		  sed -i "/^auth.*required.*pam_unix2.so/a$auth_entry" $auth_file
-		  continue
-		fi
-
-		var2=`grep ^auth.*include.*common-auth $auth_file`
-		if [ "$var2" != "" ]
-		then
-		  sed -i "/^auth.*include.*common-auth/a$auth_entry" $auth_file
-		  continue
-		fi
-
-		sed -i "0,/^auth/s/^\(auth.*\)/\1\n$auth_entry/" $auth_file 
-	fi
-done
-
-
-for password_file in "$prefix/passwd" "$prefix/gnome-passwd"
-do
-	if [ -f $password_file ]
-	then
-		sed -i '/pam_micasa/d' $password_file
-
-		passwd_entry=`echo -e "password required\tpam_micasa.so"`
-
-		var1=`grep ^password.*required.*pam_unix2.so $password_file`
-		if [ "$var1" != "" ]
-		then
-		  sed -i "/^password.*required.*pam_unix2.so/a$passwd_entry" $password_file
-		  continue
-		fi
-
-		var2=`grep ^password.*include.*common-password $password_file`
-		if [ "$var2" != "" ]
-		then
-		  sed -i "/^password.*include.*common-password/a$passwd_entry" $password_file
-		  continue
-		fi
-
-		sed -i "0,/^password/s/^\(password.*\)/\1\n$passwd_entry/" $password_file 
-	fi
-done
diff --git a/CASA/micasad/startup/casaucfgpam b/CASA/micasad/startup/casaucfgpam
index 3ba46e52..aa5c012c 100644
--- a/CASA/micasad/startup/casaucfgpam
+++ b/CASA/micasad/startup/casaucfgpam
@@ -1,12 +1,16 @@
 #!/bin/bash
 # Remove the CASA pam entries from pam files.
+DESKTOP=`grep -i desktop SuSE-release`
 
-prefix="/etc/pam.d"
-for pam_file in "$prefix/login" "$prefix/sshd" "$prefix/xdm" "$prefix/gdm" "$prefix/kdm" "$prefix/passwd" "$prefix/gnome-passwd"
-do
-	if [ -f $pam_file ]
- 	then
-  		sed -i '/pam_micasa/d' $pam_file
- 	fi
-done
+if [ "$DESKTOP" != "" ]
+then
 
+    prefix="/etc/pam.d"
+    for pam_file in "$prefix/login" "$prefix/sshd" "$prefix/xdm" "$prefix/gdm" "$prefix/kdm" "$prefix/passwd" "$prefix/gnome-passwd"
+    do
+	    if [ -f $pam_file ]
+	    then
+		    sed -i '/pam_micasa/d' $pam_file
+	    fi
+    done
+fi