Changed default ovverinding of site to current_site. Now only overrides if nothing is there already/