diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 5ce3e362b1c..3e94371b6bc 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -23,10 +23,7 @@ setenv	BLOCKSIZE	K
 
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
-	if ($uid == 0) then
-		set user = root
-	endif
-	set prompt = "%n@%m:%~ %# "
+	set prompt = "%N@%m:%~ %# "
 	set promptchars = "%#"
 
 	set filec
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index 5ce3e362b1c..3e94371b6bc 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -23,10 +23,7 @@ setenv	BLOCKSIZE	K
 
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
-	if ($uid == 0) then
-		set user = root
-	endif
-	set prompt = "%n@%m:%~ %# "
+	set prompt = "%N@%m:%~ %# "
 	set promptchars = "%#"
 
 	set filec