diff --git a/includes/admin/core/class-admin-users.php b/includes/admin/core/class-admin-users.php
index aee96956..e621c75a 100644
--- a/includes/admin/core/class-admin-users.php
+++ b/includes/admin/core/class-admin-users.php
@@ -118,7 +118,8 @@ if ( ! class_exists( 'Admin_Users' ) ) {
         function user_row_actions( $actions, $user_object ) {
             $user_id = $user_object->ID;
 
-            $actions['frontend_profile'] = "<a class='' href='" . UM()->user()->get_profile_link( $user_id ) . "'>" . __( 'View profile', 'ultimate-member' ) . "</a>";
+
+            $actions['frontend_profile'] = "<a class='' href='" . um_user_profile_url( $user_id ) . "'>" . __( 'View profile', 'ultimate-member' ) . "</a>";
 
             $submitted = get_user_meta( $user_id, 'submitted', true );
             if ( ! empty( $submitted ) )
diff --git a/includes/core/class-rewrite.php b/includes/core/class-rewrite.php
index 547b1279..5c01eb1d 100644
--- a/includes/core/class-rewrite.php
+++ b/includes/core/class-rewrite.php
@@ -229,12 +229,12 @@ if ( ! class_exists( 'Rewrite' ) ) {
 
                     $query = UM()->permalinks()->get_query_array();
 
-                    $url = um_user_profile_url();
-					if ( empty( $url ) ) {
+                    $url = um_user_profile_url( um_user( 'ID' ) );
+					/*if ( empty( $url ) ) {
 						//if empty profile slug - generate it and re-get profile URL
 						UM()->user()->generate_profile_slug( um_user( 'ID' ) );
 						$url = um_user_profile_url();
-					}
+					}*/
 
                     if ( $query ) {
                         foreach ( $query as $key => $val ) {
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index dc5a04ed..4336c7d8 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -456,7 +456,8 @@ if ( ! defined( 'ABSPATH' ) ) exit;
 		do_action( 'um_update_profile_full_name', um_user( 'ID' ), $to_update );
 
 		if ( ! isset( $args['is_signup'] ) ) {
-			$url = UM()->user()->get_profile_link( um_user( 'ID' ) );
+
+			$url = um_user_profile_url( um_user( 'ID' ) );
 			exit( wp_redirect( um_edit_my_profile_cancel_uri( $url ) ) );
 		}
 
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index e01cdf5b..3230918e 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -1399,10 +1399,23 @@ function um_admin_email() {
 /**
  * Display a link to profile page
  *
- * @return string
+ * @param int|bool $user_id
+ *
+ * @return bool|string
  */
-function um_user_profile_url() {
-	return UM()->user()->get_profile_link( um_user( 'ID' ) );
+function um_user_profile_url( $user_id = false ) {
+	if ( ! $user_id ) {
+		$user_id = um_user( 'ID' );
+	}
+
+	$url = UM()->user()->get_profile_link( $user_id );
+	if ( empty( $url ) ) {
+		//if empty profile slug - generate it and re-get profile URL
+		UM()->user()->generate_profile_slug( $user_id );
+		$url = UM()->user()->get_profile_link( $user_id );
+	}
+
+	return $url;
 }