diff --git a/samples/gae/src/main/java/samples/gae/users/UserRegistry.java b/samples/gae/src/main/java/samples/gae/users/UserRegistry.java
index 1b5bbe8bab..9b3820f54f 100644
--- a/samples/gae/src/main/java/samples/gae/users/UserRegistry.java
+++ b/samples/gae/src/main/java/samples/gae/users/UserRegistry.java
@@ -1,7 +1,5 @@
 package samples.gae.users;
 
-import com.google.appengine.api.datastore.EntityNotFoundException;
-
 /**
  *
  * Service used to maintain a list of users who are registered with the application.
diff --git a/samples/gae/src/main/java/samples/gae/web/GaeAppController.java b/samples/gae/src/main/java/samples/gae/web/GaeAppController.java
index a4000d318b..8bb841159e 100644
--- a/samples/gae/src/main/java/samples/gae/web/GaeAppController.java
+++ b/samples/gae/src/main/java/samples/gae/web/GaeAppController.java
@@ -38,7 +38,7 @@ public class GaeAppController {
 
         String logoutUrl = UserServiceFactory.getUserService().createLogoutURL("/loggedout.htm");
 
-		response.sendRedirect(logoutUrl);
+        response.sendRedirect(logoutUrl);
     }
 
     @RequestMapping(value = "/loggedout.htm", method= RequestMethod.GET)
diff --git a/samples/gae/src/main/java/samples/gae/web/RegistrationController.java b/samples/gae/src/main/java/samples/gae/web/RegistrationController.java
index d9a169c903..8d8a2916cd 100644
--- a/samples/gae/src/main/java/samples/gae/web/RegistrationController.java
+++ b/samples/gae/src/main/java/samples/gae/web/RegistrationController.java
@@ -34,11 +34,11 @@ public class RegistrationController {
         return new RegistrationForm();
     }
 
-	@RequestMapping(method = RequestMethod.POST)
-	public String register(@Valid RegistrationForm form, BindingResult result) {
-		if (result.hasErrors()) {
-			return null;
-		}
+    @RequestMapping(method = RequestMethod.POST)
+    public String register(@Valid RegistrationForm form, BindingResult result) {
+        if (result.hasErrors()) {
+            return null;
+        }
 
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         GaeUser currentUser = (GaeUser)authentication.getPrincipal();
@@ -56,6 +56,6 @@ public class RegistrationController {
         // Update the context with the full authentication
         SecurityContextHolder.getContext().setAuthentication(new GaeUserAuthentication(user, authentication.getDetails()));
 
-		return "redirect:/home.htm";
-	}
+        return "redirect:/home.htm";
+    }
 }