diff --git a/app/Http/Requests/PiggyBankStoreRequest.php b/app/Http/Requests/PiggyBankStoreRequest.php
new file mode 100644
index 0000000000..89af1191ee
--- /dev/null
+++ b/app/Http/Requests/PiggyBankStoreRequest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * PiggyBankStoreRequest.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Requests;
+
+/**
+ * Class PiggyBankStoreRequest.
+ */
+class PiggyBankStoreRequest extends Request
+{
+    /**
+     * Verify the request.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow logged in users
+        return auth()->check();
+    }
+
+    /**
+     * Returns the data required by the controller.
+     *
+     * @return array
+     */
+    public function getPiggyBankData(): array
+    {
+        return [
+            'name'         => $this->string('name'),
+            'startdate'    => $this->date('startdate'),
+            'account_id'   => $this->integer('account_id'),
+            'targetamount' => $this->string('targetamount'),
+            'targetdate'   => $this->date('targetdate'),
+            'notes'        => $this->nlString('notes'),
+            'object_group' => $this->string('object_group'),
+        ];
+    }
+
+    /**
+     * Rules for this request.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'name'         => 'required|between:1,255|uniquePiggyBankForUser',
+            'account_id'   => 'required|belongsToUser:accounts',
+            'targetamount' => 'required|numeric|gte:0.01|max:1000000000',
+            'startdate'    => 'date',
+            'targetdate'   => 'date|nullable',
+            'order'        => 'integer|min:1',
+            'object_group' => 'min:0|max:255',
+        ];
+    }
+}
diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankUpdateRequest.php
similarity index 86%
rename from app/Http/Requests/PiggyBankFormRequest.php
rename to app/Http/Requests/PiggyBankUpdateRequest.php
index afe336b96b..c3dc8e9be0 100644
--- a/app/Http/Requests/PiggyBankFormRequest.php
+++ b/app/Http/Requests/PiggyBankUpdateRequest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PiggyBankFormRequest.php
+ * PiggyBankUpdateRequest.php
  * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -27,7 +27,7 @@ use FireflyIII\Models\PiggyBank;
 /**
  * Class PiggyBankFormRequest.
  */
-class PiggyBankFormRequest extends Request
+class PiggyBankUpdateRequest extends Request
 {
     /**
      * Verify the request.
@@ -65,24 +65,17 @@ class PiggyBankFormRequest extends Request
      */
     public function rules(): array
     {
-        $nameRule = 'required|between:1,255|uniquePiggyBankForUser';
-
         /** @var PiggyBank $piggy */
         $piggy = $this->route()->parameter('piggyBank');
 
-        if (null !== $piggy) {
-            $nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . $piggy->id;
-        }
-
-        $rules = [
-            'name'         => $nameRule,
+        return [
+            'name'         => sprintf('required|between:1,255|uniquePiggyBankForUser:%d', $piggy->id),
             'account_id'   => 'required|belongsToUser:accounts',
             'targetamount' => 'required|numeric|gte:0.01|max:1000000000',
             'startdate'    => 'date',
             'targetdate'   => 'date|nullable',
             'order'        => 'integer|min:1',
+            'object_group' => 'min:0|max:255',
         ];
-
-        return $rules;
     }
 }