Possible to run a container with --restart=always and --name?

If I run a container with --restart=always and --name=X and I reboot the machine, the container does not restart and the logs show an error about the name X being already in use.

I use the name in a --link option on another container in order to allow the two containers to communicate. (The first container is a jetty server; the second is an nginx proxy that does authentication and forwards authenticated requests.)

Is there any way around this issue of --restart and --name not working well together? I’m using docker 1.6.2.