Merge branch '2.2-dev' into 102-readmeUpdates

go/go/views.py

@@ -385,6 +385,8 @@ def useradmin(request):
                     )
                 # toBlock.user.delete()
                 toBlock.blocked = True
+                toBlock.approved = False
+                toBlock.registered = False
                 toBlock.save()
 
         # If we're un-blocking users