diff --git a/greeter/autotests/fakekcheckpass.c b/greeter/autotests/fakekcheckpass.c
--- a/greeter/autotests/fakekcheckpass.c
+++ b/greeter/autotests/fakekcheckpass.c
@@ -217,9 +217,6 @@
 #endif
   const char    *method = "classic";
   const char    *username = 0;
-#ifdef ACCEPT_ENV
-  char          *p;
-#endif
   int           c, nfd;
 
 #ifdef HAVE_OSF_C2_PASSWD
@@ -263,16 +260,6 @@
     }
   }
 
-#ifdef ACCEPT_ENV
-# ifdef HAVE_PAM
-  if ((p = getenv("KDE_PAM_ACTION")))
-    caller = p;
-# endif
-  if ((p = getenv("KCHECKPASS_USER")))
-    username = p;
-#endif
-
-
   /* Now do the fandango */
   const char *password = conv_server(ConvGetHidden, 0);
   if (strcmp(password, "testpassword") == 0) {
diff --git a/kcheckpass/kcheckpass.c b/kcheckpass/kcheckpass.c
--- a/kcheckpass/kcheckpass.c
+++ b/kcheckpass/kcheckpass.c
@@ -66,10 +66,6 @@
 #include <sys/procctl.h>
 #endif
 
-
-/* Compatibility: accept some options from environment variables */
-#define ACCEPT_ENV
-
 #define THROTTLE 3
 
 static int havetty, sfd = -1, nullpass;
@@ -320,9 +316,7 @@
 #endif
   const char	*method = "classic";
   const char	*username = 0;
-#ifdef ACCEPT_ENV
   char		*p;
-#endif
   struct passwd	*pw;
   int		c, nfd;
   uid_t		uid;
@@ -382,15 +376,6 @@
     }
   }
 
-#ifdef ACCEPT_ENV
-# ifdef HAVE_PAM
-  if ((p = getenv("KDE_PAM_ACTION")))
-    caller = p;
-# endif
-  if ((p = getenv("KCHECKPASS_USER")))
-    username = p;
-#endif  
-
   uid = getuid();
   if (!username) {
     if (!(p = getenv("LOGNAME")) || !(pw = getpwnam(p)) || pw->pw_uid != uid)