diff --git a/CHANGELOG.md b/CHANGELOG.md
index 318495e8..bd9fb2e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,16 @@ All notable changes to this project will be documented in this file.
 
 This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).
 
+## [5.0.4]
+
+### Fixed
+
+- Result output configuration for missing link URL.
+
 ## [5.0.3]
 
 ### Fixed
+
 - Added field validation to the output of the error msg.
 - Additional fixes for legacy output data.
 
@@ -603,6 +610,7 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 - Initial production release.
 
+[5.0.3]: https://github.com/infinum/eightshift-forms/compare/5.0.3...5.0.4
 [5.0.2]: https://github.com/infinum/eightshift-forms/compare/5.0.2...5.0.3
 [5.0.1]: https://github.com/infinum/eightshift-forms/compare/5.0.1...5.0.2
 [5.0.1]: https://github.com/infinum/eightshift-forms/compare/5.0.0...5.0.1
diff --git a/eightshift-forms.php b/eightshift-forms.php
index be84052d..a6bd57ea 100644
--- a/eightshift-forms.php
+++ b/eightshift-forms.php
@@ -6,7 +6,7 @@
  * Description: Eightshift Forms is a complete form builder plugin that utilizes modern Block editor features with multiple third-party integrations, bringing your project to a new level.
  * Author: WordPress team @Infinum
  * Author URI: https://eightshift.com/
- * Version: 5.0.3
+ * Version: 5.0.4
  * Text Domain: eightshift-forms
  *
  * @package EightshiftForms
diff --git a/src/Blocks/custom/forms/components/forms-options.js b/src/Blocks/custom/forms/components/forms-options.js
index 4dab11e6..6dd2f96b 100644
--- a/src/Blocks/custom/forms/components/forms-options.js
+++ b/src/Blocks/custom/forms/components/forms-options.js
@@ -25,7 +25,6 @@ import {
 	truncateMiddle,
 	Repeater,
 	RepeaterItem,
-	LinkInput,
 	Toggle,
 } from '@eightshift/frontend-libs/scripts';
 import { ConditionalTagsFormsOptions } from '../../../components/conditional-tags/components/conditional-tags-forms-options';
@@ -230,7 +229,7 @@ export const FormsOptions = ({
 							>
 								<TextControl
 									value={formsVariationData?.title}
-									label={__('Title', 'eightshift-forms')}
+									placeholder={__('Title', 'eightshift-forms')}
 									onChange={(value) => {
 										const newArray = {...formsVariationData};
 										newArray.title = value;
@@ -241,7 +240,7 @@ export const FormsOptions = ({
 
 								<TextControl
 									value={formsVariationData?.subtitle}
-									label={__('Subtitle', 'eightshift-forms')}
+									placeholder={__('Subtitle', 'eightshift-forms')}
 									onChange={(value) => {
 										const newArray = {...formsVariationData};
 										newArray.subtitle = value;
@@ -267,22 +266,21 @@ export const FormsOptions = ({
 										>
 											<div className='es-border-t-cool-gray-300 es-mt-2 es-pt-2 es-fifty-fifty-h'>
 												<TextControl
-													value={item.title}
-													label={__('Title', 'eightshift-forms')}
+													value={item.label}
+													placeholder={__('Label', 'eightshift-forms')}
 													onChange={(value) => {
 														const newArray = [...formsVariationDataFiles];
-														newArray[index].title = value;
+														newArray[index].label = value;
 
 														setAttributes({ [getAttrKey('formsVariationDataFiles', attributes, manifest)]: newArray });
 													}}
 												/>
-
 												<TextControl
-													value={item.label}
-													label={__('Label', 'eightshift-forms')}
+													value={item.title}
+													placeholder={__('Title', 'eightshift-forms')}
 													onChange={(value) => {
 														const newArray = [...formsVariationDataFiles];
-														newArray[index].label = value;
+														newArray[index].title = value;
 
 														setAttributes({ [getAttrKey('formsVariationDataFiles', attributes, manifest)]: newArray });
 													}}
@@ -290,7 +288,6 @@ export const FormsOptions = ({
 											</div>
 
 											<Toggle
-												value={item.url}
 												checked={item.asFile}
 												label={__('Use this item as a file or as a link', 'eightshift-forms')}
 												reducedBottomSpacing
@@ -309,12 +306,12 @@ export const FormsOptions = ({
 											/>
 
 											{!formsVariationDataFiles[index].asFile &&
-												<LinkInput
+												<TextControl
+													placeholder={__('Link URL', 'eightshift-forms')}
 													value={item.url}
-													hideOpensInNewTab
-													onChange={({ url }) => {
+													onChange={(value) => {
 														const newArray = [...formsVariationDataFiles];
-														newArray[index].url = url;
+														newArray[index].url = value;
 
 														setAttributes({ [getAttrKey('formsVariationDataFiles', attributes, manifest)]: newArray });
 													}}
@@ -361,8 +358,8 @@ export const FormsOptions = ({
 
 											<div className='es-border-t-cool-gray-300 es-mt-2 es-pt-2 es-fifty-fifty-h'>
 												<TextControl
+													placeholder={__('Field Name', 'eightshift-forms')}
 													value={item.fieldName}
-													label={__('Field Name', 'eightshift-forms')}
 													onChange={(value) => {
 														const newArray = [...formsVariationDataFiles];
 														newArray[index].fieldName = value;
@@ -372,7 +369,7 @@ export const FormsOptions = ({
 												/>
 												<TextControl
 													value={item.fieldValue}
-													label={__('Field Value', 'eightshift-forms')}
+													placeholder={__('Field Value', 'eightshift-forms')}
 													onChange={(value) => {
 														const newArray = [...formsVariationDataFiles];
 														newArray[index].fieldValue = value;