diff --git a/nvim-init.vim b/nvim-init.vim
index 8718525..bef6383 100644
--- a/nvim-init.vim
+++ b/nvim-init.vim
@@ -278,9 +278,10 @@ augroup END
 
 " Keep undo history {{{2
 " ======================
-set undodir=/tmp/vim-undodir
+let g:euid = substitute(system('echo $EUID'),'\n$','','''')
+execute "set undodir=/tmp/vim-undodir-" . g:euid
 set undofile
-set directory^=/tmp/vim-swapfile//
+execute "set directory^=/tmp/vim-swapfile-" . g:euid . "//"