diff --git a/tasks/__init__.py b/tasks/__init__.py
index 7dea728c..c51c6e8d 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -22,7 +22,7 @@ def setup(ctx):
         osx.setup(ctx)
     else:
         linux.setup(ctx)
-    fix_pip_download_cache(ctx)
+    fix_pip(ctx)
     python(ctx)
     powerline(ctx)
     install_npm_libraries(ctx)
@@ -115,11 +115,12 @@ def customize_user_settings(ctx):
 
 
 @ctask
-def fix_pip_download_cache(ctx):
-    ctx.run("sudo chown imalison ~/.pip/download_cache -R")
+def fix_pip(ctx):
+    ctx.run("sudo easy_install -U pip")
+    ctx.run("sudo chown $(whoami) ~/.pip/download_cache -R")
 
 
-ns.add_task(fix_pip_download_cache)
+ns.add_task(fix_pip)
 ns.add_task(change_shell)
 ns.add_task(customize_user_settings)
 ns.add_task(dotfiles)
diff --git a/tasks/osx.py b/tasks/osx.py
index 04c64587..6cae420f 100644
--- a/tasks/osx.py
+++ b/tasks/osx.py
@@ -15,7 +15,6 @@ def setup(ctx):
     set_path_for_launchd(ctx)
     rvm(ctx)
     fonts(ctx)
-    fix_pip(ctx)
     fix_htop(ctx)
     setup_dbus(ctx)
 
@@ -158,11 +157,6 @@ def iTerm(ctx):
     ))
 
 
-@ctask
-def fix_pip(ctx):
-    ctx.run("sudo easy_install -U pip")
-
-
 @ctask
 def launch_agents(ctx, flags=''):
     ctx.run('dotfiles -sn{1} -R {0}/resources/LaunchAgents/ '