Commented out cam.ac.uk changes to User.php - seems to be breaking things (sorry Andrew...). Automated tests FTW though