diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index 1997363d6..0b21de4dd 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -58,9 +58,6 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     getAccountByUserName(userName).flatMap(_.image).map { image =>
       contentType = FileUtil.getMimeType(image)
       new java.io.File(getUserUploadDir(userName), image)
-//    } getOrElse {
-//      contentType = "image/png"
-//      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
     } getOrElse NotFound
   }
 
@@ -86,7 +83,11 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
   get("/register"){
     if(loadSystemSettings().allowAccountRegistration){
-      account.html.edit(None, None)
+      if(context.loginAccount.isDefined){
+        redirect("/")
+      } else {
+        account.html.edit(None, None)
+      }
     } else NotFound
   }
 
diff --git a/src/main/scala/app/SignInController.scala b/src/main/scala/app/SignInController.scala
index ccea39b17..3e009637e 100644
--- a/src/main/scala/app/SignInController.scala
+++ b/src/main/scala/app/SignInController.scala
@@ -35,7 +35,7 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
         session.removeAttribute("REDIRECT")
         redirect(redirectUrl.asInstanceOf[String])
       }.getOrElse {
-        redirect("/%s".format(account.get.userName))
+        redirect("/")
       }
     }
   }