diff --git a/src/main/scala/app/SettingsController.scala b/src/main/scala/app/SettingsController.scala
index 77b3431..a39fdaa 100644
--- a/src/main/scala/app/SettingsController.scala
+++ b/src/main/scala/app/SettingsController.scala
@@ -5,11 +5,12 @@
 import util.{UsersAuthenticator, OwnerAuthenticator}
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
+import org.scalatra.FlashMapSupport
 
 class SettingsController extends SettingsControllerBase
   with RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator
 
-trait SettingsControllerBase extends ControllerBase {
+trait SettingsControllerBase extends ControllerBase with FlashMapSupport {
   self: RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator =>
 
   case class OptionsForm(description: Option[String], defaultBranch: String, isPrivate: Boolean)
@@ -37,7 +38,7 @@
    * Display the Options page.
    */
   get("/:owner/:repository/settings/options")(ownerOnly {
-    settings.html.options(_)
+    settings.html.options(_, flash.get("info"))
   })
   
   /**
@@ -45,6 +46,7 @@
    */
   post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
     saveRepositoryOptions(repository.owner, repository.name, form.description, form.defaultBranch, form.isPrivate)
+    flash += "info" -> "Settings updated."
     redirect("/%s/%s/settings/options".format(repository.owner, repository.name))
   })
   
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
index 5426d75..7395288 100644
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -1,9 +1,15 @@
-@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@(repository: service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main("Settings"){
   @html.header("settings", repository)
   @menu("options", repository){
+    @if(info.isDefined){
+      <div class="alert alert-info">
+        <button type="button" class="close" data-dismiss="alert">×</button>
+        @info
+      </div>
+    }
     <form id="form" method="post" action="@url(repository)/settings/options" validate="true">
       <div class="box">
         <div class="box-header">Settings</div>