Make %{Stripped-User-Name:-%{User-Name}} work again