diff --git a/vim/vimrc b/vim/vimrc
index f775950..1bb2883 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
 if has("autocmd")
   autocmd! bufwritepost .vimrc source ~/.vimrc
 endif
-if !empty(system("setxkbmap -print|grep bepo"))
+if ((!empty(system("setxkbmap -print|grep bepo"))) || ($USER == "root"))
 	source ~/.vimrc.bepo
 endif
 
@@ -37,7 +37,7 @@ if ($XDG_DATA_HOME != '')
 	silent !mkdir $XDG_DATA_HOME/vim/undodir -p > /dev/null 2>&1
 	set undodir=$XDG_DATA_HOME/vim/undodir
 	if has("autocmd")
-		autocmd bufwritepost * silent ! chmod" 600 $XDG_DATA_HOME/vim/undodir/* > /dev/null 2>&1 && rm $XDG_DATA_HOME/vim/undodir/*\%.git\%COMMIT_EDITMSG > /dev/null 2>&1
+		autocmd bufwritepost * silent ! chmod 600 $XDG_DATA_HOME/vim/undodir/* > /dev/null 2>&1 && rm $XDG_DATA_HOME/vim/undodir/*\%.git\%COMMIT_EDITMSG > /dev/null 2>&1
 	endif
 else
 	if ($HOME != '')