diff --git a/CHANGELOG b/CHANGELOG
index cb9995da..8c691735 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 v 2.0.2
   - fix login on firefox when fields are autofilled by the browser
+  - user is now logged in after registration
   - fix link to documentation on home page and about page
   - fields autocomplete is disabled on the profile page
   - users are able to delete their account again
diff --git a/src/main/java/com/commafeed/frontend/resource/UserREST.java b/src/main/java/com/commafeed/frontend/resource/UserREST.java
index 7a6e3ae4..3ad33372 100644
--- a/src/main/java/com/commafeed/frontend/resource/UserREST.java
+++ b/src/main/java/com/commafeed/frontend/resource/UserREST.java
@@ -220,9 +220,10 @@ public class UserREST {
 	@POST
 	@UnitOfWork
 	@ApiOperation(value = "Register a new account")
-	public Response register(@Valid @ApiParam(required = true) RegistrationRequest req) {
+	public Response register(@Valid @ApiParam(required = true) RegistrationRequest req, @Session HttpSession session) {
 		try {
 			userService.register(req.getName(), req.getPassword(), req.getEmail(), Arrays.asList(Role.USER));
+			userService.login(req.getName(), req.getPassword(), session);
 			return Response.ok().build();
 		} catch (final IllegalArgumentException e) {
 			return Response.status(422).entity(new ValidationErrorMessage(Collections.<ConstraintViolation<?>> emptySet()) {