diff --git a/Makefile b/Makefile
index aa5bed0542b4c..3df2399112418 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Naming convention:
 #	for stable releases we use "1.0.0" format
 #   for pre-releases, we use   "1.0.0-beta.2" format
-VERSION=1.0.4
+VERSION=1.0.5
 
 # These are standard autotools variables, don't change them please
 BUILDDIR ?= build
@@ -129,7 +129,7 @@ tag:
 # make release - produces a binary release tarball 
 #	
 .PHONY: release
-release: clean all
+release: clean setver all
 	cp -rf $(BUILDDIR) teleport
 	@echo $(GITTAG) > teleport/VERSION
 	tar -czf $(RELEASE).tar.gz teleport
diff --git a/tool/tctl/main.go b/tool/tctl/main.go
index a571a6b668771..727b12cb7c4b2 100644
--- a/tool/tctl/main.go
+++ b/tool/tctl/main.go
@@ -276,7 +276,6 @@ func printHeader(t *goterm.Table, cols []string) {
 // Add creates a new sign-up token and prints a token URL to stdout.
 // A user is not created until he visits the sign-up URL and completes the process
 func (u *UserCommand) Add(client *auth.TunClient) error {
-
 	// if no local logins were specified, default to 'login'
 	if u.allowedLogins == "" {
 		u.allowedLogins = u.login
@@ -308,7 +307,13 @@ func (u *UserCommand) Add(client *auth.TunClient) error {
 	} else {
 		hostname = proxies[0].Hostname
 	}
-	url := web.CreateSignupLink(net.JoinHostPort(hostname, strconv.Itoa(defaults.HTTPListenPort)), token)
+
+	// try to auto-suggest the activation link
+	_, proxyPort, err := net.SplitHostPort(u.config.Proxy.WebAddr.Addr)
+	if err != nil {
+		proxyPort = strconv.Itoa(defaults.HTTPListenPort)
+	}
+	url := web.CreateSignupLink(net.JoinHostPort(hostname, proxyPort), token)
 	fmt.Printf("Signup token has been created and is valid for %v seconds. Share this URL with the user:\n%v\n\nNOTE: make sure '%s' is accessible!\n", defaults.MaxSignupTokenTTL.Seconds(), url, hostname)
 	return nil
 }
diff --git a/version.go b/version.go
index d37c72ccbb52e..01b18154e068a 100644
--- a/version.go
+++ b/version.go
@@ -2,7 +2,7 @@
 package teleport
 
 const (
-	Version = "1.0.4"
+	Version = "1.0.5"
 )
 
 var Gitref string