diff --git a/kuser/kinit.c b/kuser/kinit.c
index 30d6124e0..4e84d2d7b 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -1,7 +1,9 @@
 #include <stdio.h>
 #include <string.h>
+#include <pwd.h>
 #include <krb5.h>
 
+
 int
 main (int argc, char **argv)
 {
@@ -20,9 +22,22 @@ main (int argc, char **argv)
   if (err)
     abort ();
 
-  err = krb5_parse_name (context, argv[1], &principal);
-  if (err)
-    abort ();
+  
+  if(argv[1]){
+      err = krb5_parse_name (context, argv[1], &principal);
+      if (err)
+	  abort ();
+      
+  }else{
+      char *realm;
+      struct passwd *pw;
+      krb5_get_lrealm(&realm);
+      pw = getpwuid(getuid());
+      krb5_build_principal(context, &principal, strlen(realm), realm,
+			   pw->pw_name, NULL);
+
+      free(realm);
+  }
 
   err = krb5_cc_initialize (context, ccache, principal);
   if (err)