From 5cb2d3d2e233def07d6956af47dfc49acc45c7e6 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Thu, 20 Mar 2014 03:24:17 -0400
Subject: [PATCH] Bug fix

---
 README.md            | 1 +
 routers/user/user.go | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index b43e3c98a5..3a1023c6d9 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ There are some very good products in this category such as [gitlab](http://gitla
 - Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, develop specification, change log and road map.
 - See [Trello Broad](https://trello.com/b/uxAoeLUl/gogs-go-git-service) to follow the develop team.
 - Try it before anything? Go down to **Installation -> Install from binary** section!.
+- Having troubles? Get help from [Troubleshooting](https://github.com/gogits/gogs/wiki/Troubleshooting).
 
 ## Features
 
diff --git a/routers/user/user.go b/routers/user/user.go
index 37070af3f9..f495cb13ab 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -233,6 +233,10 @@ func Activate(ctx *middleware.Context) {
 	code := ctx.Query("code")
 	if len(code) == 0 {
 		ctx.Data["IsActivatePage"] = true
+		if ctx.User.IsActive {
+			ctx.Error(404)
+			return
+		}
 		// Resend confirmation e-mail.
 		if base.Service.RegisterEmailConfirm {
 			ctx.Data["Hours"] = base.Service.ActiveCodeLives / 60