diff --git a/.env b/.env
index 8b3dabc73585cb44651df0c3b85918271ea7dcea..5285b0695d5ccfb98504a0f8d4c12464ff06327f 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 REACT_APP_STYLEGUIDE_URL=https://styleguide.pir-test.eu/2.3.3
-REACT_APP_API_BASE_URL=https://cf2021.pir-test.eu/api
+REACT_APP_API_BASE_URL=https://cf2021.pirati.cz/api
 REACT_APP_MATOMO_ID=135
 REACT_APP_SENTRY_DSN=https://aa80453ff4d54b9a9c1b49e79060498a@sentry.pir-test.eu/14
diff --git a/src/api.js b/src/api.js
index 8bfc444b5d16023621fa24725168fe293fbc7628..f5b10cfdcd006c39452931ea736b12d9a39744d0 100644
--- a/src/api.js
+++ b/src/api.js
@@ -20,6 +20,7 @@ export const fetch = async (
     body,
     method,
     headers,
+    redirect: "follow",
   });
 
   if (!!expectedStatus && response.status !== expectedStatus) {
diff --git a/src/containers/AddAnnouncementForm.jsx b/src/containers/AddAnnouncementForm.jsx
index 37bd25284f072654b8e211b58785804aa7a8d1b0..2b7bf5a6f683848addf717b429c8444bd1989611 100644
--- a/src/containers/AddAnnouncementForm.jsx
+++ b/src/containers/AddAnnouncementForm.jsx
@@ -46,6 +46,8 @@ const AddAnnouncementForm = ({ className }) => {
   };
 
   const onAdd = async (evt) => {
+    evt.preventDefault();
+
     let preventAction = false;
     const payload = {
       content: text,
@@ -82,7 +84,7 @@ const AddAnnouncementForm = ({ className }) => {
   };
 
   return (
-    <div className={className}>
+    <form className={className} onSubmit={onAdd}>
       {addingError && (
         <ErrorMessage>
           Při přidávání oznámení došlo k problému: {addingError}.
@@ -150,7 +152,7 @@ const AddAnnouncementForm = ({ className }) => {
       </div>
 
       <Button
-        onClick={onAdd}
+        type="submit"
         className="text-sm mt-4"
         hoverActive
         loading={adding}
@@ -159,7 +161,7 @@ const AddAnnouncementForm = ({ className }) => {
       >
         Přidat oznámení
       </Button>
-    </div>
+    </form>
   );
 };
 
diff --git a/src/containers/AddPostForm.jsx b/src/containers/AddPostForm.jsx
index 0503b95d6fa7109429a56c91ab69cfaad4cba246..42fcf79a7e90b2dccdd693ca222193be36260ec6 100644
--- a/src/containers/AddPostForm.jsx
+++ b/src/containers/AddPostForm.jsx
@@ -74,6 +74,8 @@ const AddPostForm = ({ className, canAddProposal }) => {
   };
 
   const onAdd = async (evt) => {
+    evt.preventDefault();
+
     if (!!text) {
       if (!error) {
         const result = await (type === "post" ? addPost : addProposal).run({
@@ -125,7 +127,7 @@ const AddPostForm = ({ className, canAddProposal }) => {
           "p-4 lg:p-8 " + (showAddConfirm || !expanded ? "hidden" : "")
         }
       >
-        <div className="space-y-4">
+        <form className="space-y-4" onSubmit={onAdd}>
           {apiError && is429ApiError && (
             <div className="alert alert--warning">
               <i className="alert__icon ico--clock text-lg" />
@@ -203,7 +205,7 @@ const AddPostForm = ({ className, canAddProposal }) => {
 
           <div className="space-x-4">
             <Button
-              onClick={onAdd}
+              type="submit"
               disabled={error || addingPost || addingProposal}
               loading={addingPost || addingProposal}
               fullwidth
@@ -227,7 +229,7 @@ const AddPostForm = ({ className, canAddProposal }) => {
               .
             </span>
           </div>
-        </div>
+        </form>
       </CardBody>
     </Card>
   );